diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-05-27 17:46:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-05-27 17:46:30 (GMT) |
| commit | 5278b9737dad788a99cd44186b309e402c311139 (patch) | |
| tree | b2f58888b58a5315e56affefd0cdc866ccf44aca /testpar | |
| parent | fea439b440b85f9ed97aeb01a64b44fdbacac047 (diff) | |
| download | hdf5-5278b9737dad788a99cd44186b309e402c311139.zip hdf5-5278b9737dad788a99cd44186b309e402c311139.tar.gz hdf5-5278b9737dad788a99cd44186b309e402c311139.tar.bz2 | |
[svn-r25222] Merge cmake_ext_mod into 1.8
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | testpar/CMakeTests.cmake | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index 968eba6..c90634c 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TEST_PAR) #----------------------------------------------------------------------------- # Apply Definitions to compiler in this directory and below #----------------------------------------------------------------------------- -add_definitions (${HDF5_EXTRA_C_FLAGS}) +add_definitions (${HDF_EXTRA_C_FLAGS}) INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib ) diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index 8165eff..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) @@ -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) |