mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-05 15:42:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '854223e3fcf5e90ad5fae25ff05deb4276ce001b':
  Add missing default
  Correct varname
  Separate out MPI tests that fail on MPI version
This commit is contained in:
Scot Breitenfeld 2019-05-01 14:33:21 -05:00
commit c30a24bb16
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/cmake/scripts/HDF5config.cmake
View File

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

24
testpar/CMakeTests.cmake
View File

@ -25,10 +25,14 @@ add_test (NAME MPI_TEST-clear-testphdf5-objects
)
set_tests_properties (MPI_TEST-clear-testphdf5-objects PROPERTIES FIXTURES_SETUP par_clear_testphdf5)
set (SKIP_tests
cchunk3
tldsc
)
set (SKIP_testphdf5 "")
#if (HDF5_OPENMPI_VERSION_SKIP)
# set (SKIP_testphdf5 "${SKIP_testphdf5};-x;ecdsetw")
#endif ()
foreach (skiptest SKIP_tests)
set (SKIP_testphdf5 "${SKIP_testphdf5};-x;${skiptest}")
endforeach ()
add_test (NAME MPI_TEST_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} ${SKIP_testphdf5})
set_tests_properties (MPI_TEST_testphdf5 PROPERTIES
@ -41,6 +45,20 @@ if (last_test)
endif ()
set (last_test "MPI_TEST_testphdf5")
#execute the skipped 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
ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}"
WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
)
if (last_test)
set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "MPI_TEST_testphdf5_${skiptest}")
endforeach ()
#if (HDF5_OPENMPI_VERSION_SKIP)
# list (REMOVE_ITEM H5P_TESTS t_shapesame)
#endif ()