diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-02-21 19:23:59 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-02-21 19:23:59 (GMT) |
| commit | b7d6f11182f148c0d0fff8d077d7fa342080d98c (patch) | |
| tree | 0aa0ffedde62d58bb836993809394d58268a9727 /testpar/CMakeTests.cmake | |
| parent | 0c6110e586985aa6d2356b739179130c5d79e9c1 (diff) | |
| download | hdf5-b7d6f11182f148c0d0fff8d077d7fa342080d98c.zip hdf5-b7d6f11182f148c0d0fff8d077d7fa342080d98c.tar.gz hdf5-b7d6f11182f148c0d0fff8d077d7fa342080d98c.tar.bz2 | |
HDFFV-10703 - Update CMake variable handling
Diffstat (limited to 'testpar/CMakeTests.cmake')
| -rw-r--r-- | testpar/CMakeTests.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index 12ccc58..214801b 100644 --- a/testpar/CMakeTests.cmake +++ b/testpar/CMakeTests.cmake @@ -26,7 +26,7 @@ add_test (NAME MPI_TEST-clear-testphdf5-objects set_tests_properties (MPI_TEST-clear-testphdf5-objects PROPERTIES FIXTURES_SETUP par_clear_testphdf5) set (SKIP_testphdf5 "") -#if (${HDF5_OPENMPI_VERSION_SKIP}) +#if (HDF5_OPENMPI_VERSION_SKIP) # set (SKIP_testphdf5 "${SKIP_testphdf5};-x;ecdsetw") #endif () @@ -36,12 +36,12 @@ set_tests_properties (MPI_TEST_testphdf5 PROPERTIES ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR} ) -if (NOT "${last_test}" STREQUAL "") +if (last_test) set_tests_properties (MPI_TEST_testphdf5 PROPERTIES DEPENDS ${last_test}) endif () set (last_test "MPI_TEST_testphdf5") -#if (${HDF5_OPENMPI_VERSION_SKIP}) +#if (HDF5_OPENMPI_VERSION_SKIP) # list (REMOVE_ITEM H5P_TESTS t_shapesame) #endif () @@ -74,17 +74,17 @@ add_test (NAME MPI_TEST-clear-objects ) set_tests_properties (MPI_TEST-clear-objects PROPERTIES FIXTURES_SETUP par_clear_objects) -foreach (testp ${H5P_TESTS}) - add_test (NAME MPI_TEST_${testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${testp}> ${MPIEXEC_POSTFLAGS}) - set_tests_properties (MPI_TEST_${testp} PROPERTIES +foreach (h5_testp ${H5P_TESTS}) + add_test (NAME MPI_TEST_${h5_testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${h5_testp}> ${MPIEXEC_POSTFLAGS}) + set_tests_properties (MPI_TEST_${h5_testp} PROPERTIES FIXTURES_REQUIRED par_clear_objects ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR} ) - if (NOT "${last_test}" STREQUAL "") - set_tests_properties (MPI_TEST_${testp} PROPERTIES DEPENDS ${last_test}) + if (last_test) + set_tests_properties (MPI_TEST_${h5_testp} PROPERTIES DEPENDS ${last_test}) endif () - set (last_test "MPI_TEST_${testp}") + set (last_test "MPI_TEST_${h5_testp}") endforeach () # The t_pflush1 test is hard-coded to fail. |