diff options
Diffstat (limited to 'testpar/CMakeTests.cmake')
-rw-r--r-- | testpar/CMakeTests.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index 5ac96e6..3716ee6 100644 --- a/testpar/CMakeTests.cmake +++ b/testpar/CMakeTests.cmake @@ -11,7 +11,10 @@ foreach (testp ${H5P_TESTS}) add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:${testp}>) endforeach (testp ${H5P_TESTS}) -SET_TESTS_PROPERTIES(TEST_PAR_t_pflush2 PROPERTIES DEPENDS TEST_PAR_t_pflush1) +# The following will only be correct on windows shared +#set_tests_properties (TEST_PAR_t_pflush1 PROPERTIES WILL_FAIL "true") +set_property (TEST TEST_PAR_t_pflush1 PROPERTY PASS_REGULAR_EXPRESSION "PASSED") +set_tests_properties (TEST_PAR_t_pflush2 PROPERTIES DEPENDS TEST_PAR_t_pflush1) if (HDF5_TEST_VFD) @@ -37,7 +40,7 @@ if (HDF5_TEST_VFD) if (NOT HDF5_ENABLE_USING_MEMCHECKER) foreach (test ${H5P_VFD_TESTS}) add_test ( - NAME VFD-${vfdname}-${test} + NAME TEST_PAR_VFD-${vfdname}-${test} COMMAND "${CMAKE_COMMAND}" -D "TEST_PROGRAM=$<TARGET_FILE:${test}>" -D "TEST_ARGS:STRING=" @@ -45,7 +48,7 @@ if (HDF5_TEST_VFD) -D "TEST_EXPECT=${resultcode}" -D "TEST_OUTPUT=${test}" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" - -P "${HDF5_RESOURCES_DIR}/vfdTest.cmake" + -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) endforeach (test ${H5P_VFD_TESTS}) endif (NOT HDF5_ENABLE_USING_MEMCHECKER) |