mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-24 17:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit 'ee35fb8a7fe3804e4146c54020b6e2272ab251e3':
  Change default for HPC
  Correct var usage syntax
This commit is contained in:
Allen Byrne 2019-05-01 16:42:50 -05:00
commit 2f406b8955
2 changed files with 3 additions and 3 deletions
config/cmake/scripts
HDF5config.cmake
testpar
CMakeTests.cmake

2
config/cmake/scripts/HDF5config.cmake

@ -177,7 +177,7 @@ if (NOT DEFINED HPC)
endif ()
endif ()
else ()
set (CTEST_SITE "HPC.XXXX")
set (CTEST_SITE "${SITE_OS_NAME}")
set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
endif ()

4
testpar/CMakeTests.cmake

@ -30,7 +30,7 @@ set (SKIP_tests
tldsc
)
set (SKIP_testphdf5 "")
foreach (skiptest SKIP_tests)
foreach (skiptest ${SKIP_tests})
set (SKIP_testphdf5 "${SKIP_testphdf5};-x;${skiptest}")
endforeach ()
@ -46,7 +46,7 @@ endif ()
set (last_test "MPI_TEST_testphdf5")
#execute the skipped tests
foreach (skiptest SKIP_tests)
foreach (skiptest ${SKIP_tests})
add_test (NAME MPI_TEST_testphdf5_${skiptest} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} -o ${skiptest})
set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES
FIXTURES_REQUIRED par_clear_testphdf5