summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-08-05 12:32:01 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-08-05 12:32:01 (GMT)
commit59a8b10b881b33a9d47243c16600be18e697a68c (patch)
tree73937c6bcc8773661945b606ca3d648cb8b54808 /testpar
parent42bd90edc82445a9758937a5149874b79266a733 (diff)
downloadhdf5-59a8b10b881b33a9d47243c16600be18e697a68c.zip
hdf5-59a8b10b881b33a9d47243c16600be18e697a68c.tar.gz
hdf5-59a8b10b881b33a9d47243c16600be18e697a68c.tar.bz2
Merge fixes and code reconciliation wit develop
Diffstat (limited to 'testpar')
-rw-r--r--testpar/CMakeVFDTests.cmake68
1 files changed, 37 insertions, 31 deletions
diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake
index 7db99de..0726da2 100644
--- a/testpar/CMakeVFDTests.cmake
+++ b/testpar/CMakeVFDTests.cmake
@@ -15,32 +15,32 @@
### T E S T I N G ###
##############################################################################
##############################################################################
- set (VFD_LIST
- sec2
- stdio
- core
- split
- multi
- family
- )
+set (VFD_LIST
+ sec2
+ stdio
+ core
+ split
+ multi
+ family
+)
- set (H5P_VFD_TESTS
- t_pflush1
- t_pflush2
- )
+set (H5P_VFD_TESTS
+ t_pflush1
+ t_pflush2
+)
- if (DIRECT_VFD)
- set (VFD_LIST ${VFD_LIST} direct)
- endif ()
+if (DIRECT_VFD)
+ 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 (h5_test ${H5P_VFD_TESTS})
- add_test (
+macro (ADD_VFD_TEST vfdname resultcode)
+ if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ foreach (h5_test ${H5P_VFD_TESTS})
+ add_test (
NAME MPI_TEST_VFD-${vfdname}-${h5_test}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@@ -51,16 +51,22 @@ endforeach ()
-D "TEST_OUTPUT=${vfdname}-${h5_test}.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
- )
- set_tests_properties (MPI_TEST_VFD-${vfdname}-${h5_test} PROPERTIES
- ENVIRONMENT "srcdir=${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}"
- WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}
- )
- endforeach ()
- endif ()
- endmacro ()
+ )
+ set_tests_properties (MPI_TEST_VFD-${vfdname}-${h5_test} PROPERTIES
+ ENVIRONMENT "srcdir=${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}"
+ WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}
+ )
+ endforeach ()
+ endif ()
+endmacro ()
+
+##############################################################################
+##############################################################################
+### T H E T E S T S ###
+##############################################################################
+##############################################################################
- # Run test with different Virtual File Driver
- foreach (h5_vfd ${VFD_LIST})
- ADD_VFD_TEST (${h5_vfd} 0)
- endforeach ()
+# Run test with different Virtual File Driver
+foreach (h5_vfd ${VFD_LIST})
+ ADD_VFD_TEST (${h5_vfd} 0)
+endforeach ()