TRILAB-111 fixes for parallel testing

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 ()