Skip to content

Commit

Permalink
Change from cmake -E copy_directory to cp -r
Browse files Browse the repository at this point in the history
For some reason, this just fails sometimes on my Linux RHEL6 machine with
cmake 3.11.  I am tired of dealing with this.  Moving to cp -r fixed this
problem.

Build/Test Cases Summary
Enabled Packages:
Enabled all Packages
0) MPI_DEBUG => passed: passed=361,notpassed=0 (1.39 min)
1) SERIAL_RELEASE => passed: passed=361,notpassed=0 (1.00 min)
Other local commits for this build/test group: d5840cc, 89f3dfd, 6de62c0
  • Loading branch information
bartlettroscoe committed Feb 26, 2020
1 parent d5840cc commit 5a4ad10
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
8 changes: 4 additions & 4 deletions test/ci_support/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,14 @@ FUNCTION(Test_TribitsExampleProject_w_tribits_get_tribits_packages_from_files_li
OVERALL_NUM_MPI_PROCS 1

TEST_0
CMND "${CMAKE_COMMAND}"
ARGS -E copy_directory
CMND cp
ARGS -r
"${${PROJECT_NAME}_TRIBITS_DIR}/examples/TribitsExampleProject"
TribitsExampleProject

TEST_1
CMND "${CMAKE_COMMAND}"
ARGS -E copy_directory
CMND cp
ARGS -r
"${${PROJECT_NAME}_TRIBITS_DIR}"
TribitsExampleProject/cmake/tribits

Expand Down
18 changes: 6 additions & 12 deletions test/ci_support/DumpXmlDepsTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,8 @@ TRIBITS_ADD_ADVANCED_TEST( DepXmlDumpTests_NoProjectSourceDir

TEST_0
MESSAGE "Copy tribits dir so that it will not appear in the standard location under any TriBITS project"
CMND ${CMAKE_COMMAND}
ARGS -E copy_directory
${${PROJECT_NAME}_TRIBITS_DIR}
tribits
CMND cp
ARGS -r ${${PROJECT_NAME}_TRIBITS_DIR} tribits

TEST_1 CMND "${CMAKE_COMMAND}"
ARGS
Expand Down Expand Up @@ -137,16 +135,12 @@ TRIBITS_ADD_ADVANCED_TEST( DepXmlDumpTests_DefaultProjectSourceDir
OVERALL_NUM_MPI_PROCS 1

TEST_0
CMND ${CMAKE_COMMAND}
ARGS -E copy_directory
${MOCK_TRILINOS_DIR}
MockTrilinos
CMND cp
ARGS -r ${MOCK_TRILINOS_DIR} MockTrilinos

TEST_1
CMND ${CMAKE_COMMAND}
ARGS -E copy_directory
${${PROJECT_NAME}_TRIBITS_DIR}
MockTrilinos/cmake/tribits
CMND cp
ARGS -r ${${PROJECT_NAME}_TRIBITS_DIR} MockTrilinos/cmake/tribits

TEST_2 CMND "${CMAKE_COMMAND}"
ARGS
Expand Down

0 comments on commit 5a4ad10

Please sign in to comment.