diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-02-13 21:53:25 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-02-13 21:53:59 (GMT) |
commit | b95f05638ce40ccd944248f5865a248f39ef0d10 (patch) | |
tree | 3cc7bce865e0be1210d64633d59a379b47fb0805 /testpar/CMakeVFDTests.cmake | |
parent | 50b85e03300f4ba662038772cd6fd6fa84ecf97d (diff) | |
download | hdf5-b95f05638ce40ccd944248f5865a248f39ef0d10.zip hdf5-b95f05638ce40ccd944248f5865a248f39ef0d10.tar.gz hdf5-b95f05638ce40ccd944248f5865a248f39ef0d10.tar.bz2 |
TRILAB-111 fixes for parallel testing
Diffstat (limited to 'testpar/CMakeVFDTests.cmake')
-rw-r--r-- | testpar/CMakeVFDTests.cmake | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake index e2bf88a..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 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 () |