summaryrefslogtreecommitdiffstats
path: root/testpar/CMakeVFDTests.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-02-14 22:38:25 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-02-14 22:38:25 (GMT)
commitd6036ce89fe0a284bd1e6486fc6a50e932dd1e2f (patch)
treeabc1b49d1e64426c5e011305ff5bc961ad40dd7a /testpar/CMakeVFDTests.cmake
parente32b2b08c996c940f16c905eb7a92d5310aa9e88 (diff)
parentf4f8be19125002764715f6cd25372477c729f809 (diff)
downloadhdf5-d6036ce89fe0a284bd1e6486fc6a50e932dd1e2f.zip
hdf5-d6036ce89fe0a284bd1e6486fc6a50e932dd1e2f.tar.gz
hdf5-d6036ce89fe0a284bd1e6486fc6a50e932dd1e2f.tar.bz2
Merge pull request #1543 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'f4f8be19125002764715f6cd25372477c729f809': Script changes from develop Added TRILABS-111 note Add HDFFV-10628 known problem TRILAB-111 Update MPI CMake
Diffstat (limited to 'testpar/CMakeVFDTests.cmake')
-rw-r--r--testpar/CMakeVFDTests.cmake22
1 files changed, 19 insertions, 3 deletions
diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake
index b6b065f..de16a31 100644
--- a/testpar/CMakeVFDTests.cmake
+++ b/testpar/CMakeVFDTests.cmake
@@ -33,20 +33,36 @@
set (VFD_LIST ${VFD_LIST} direct)
endif ()
+foreach (vfdtest ${VFD_LIST})
+ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
+endforeach ()
+
macro (ADD_VFD_TEST vfdname resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
foreach (test ${H5P_VFD_TESTS})
add_test (
- NAME TEST_PAR_VFD-${vfdname}-${test}
+ NAME MPI_TEST_VFD-${vfdname}-${test}-clear-objects
+ COMMAND ${CMAKE_COMMAND}
+ -E remove
+ ${vfdname}-shared/${vfdname}-${test}.out
+ ${vfdname}-shared/${vfdname}-${test}.out.err
+ )
+ add_test (
+ NAME MPI_TEST_VFD-${vfdname}-${test}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:${test}>"
-D "TEST_ARGS:STRING="
-D "TEST_VFD:STRING=${vfdname}"
-D "TEST_EXPECT=${resultcode}"
- -D "TEST_OUTPUT=${test}"
- -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+ -D "TEST_OUTPUT=${vfdname}-${test}.out"
+ -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
+ set_tests_properties (MPI_TEST_VFD-${vfdname}-${test} PROPERTIES
+ DEPENDS MPI_TEST_VFD-${vfdname}-${test}-clear-objects
+ ENVIRONMENT "srcdir=${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}"
+ WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}
+ )
endforeach ()
endif ()
endmacro ()