diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-10-26 02:17:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-26 02:17:23 (GMT) |
| commit | aee9e06aa8ff85397a54f7955d62466d39b23ddc (patch) | |
| tree | 13acfaf6e70c17f8737f3a905e80778ba08c2517 | |
| parent | b0bd984ed620aeca1047f1f45692890eacb924be (diff) | |
| download | hdf5-aee9e06aa8ff85397a54f7955d62466d39b23ddc.zip hdf5-aee9e06aa8ff85397a54f7955d62466d39b23ddc.tar.gz hdf5-aee9e06aa8ff85397a54f7955d62466d39b23ddc.tar.bz2 | |
Consolidate VFD create list macro (#1132)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | c++/test/CMakeVFDTests.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 1 | ||||
| -rw-r--r-- | test/CMakeVFDTests.cmake | 3 | ||||
| -rw-r--r-- | testpar/CMakeVFDTests.cmake | 2 | ||||
| -rw-r--r-- | tools/test/h5dump/CMakeVFDTests.cmake | 2 | ||||
| -rw-r--r-- | tools/test/h5repack/CMakeVFDTests.cmake | 2 |
7 files changed, 5 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c6df76..2b5ff7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -946,6 +946,9 @@ if (BUILD_TESTING) if (HDF5_TEST_VFD) option (HDF5_TEST_FHEAP_VFD "Execute tests with different VFDs" ON) mark_as_advanced (HDF5_TEST_FHEAP_VFD) + + # Initialize the list of VFDs to be used for testing and create a test folder for each VFD + H5_SET_VFD_LIST() endif () option (HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF) diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake index d525bb5..4f3d137 100644 --- a/c++/test/CMakeVFDTests.cmake +++ b/c++/test/CMakeVFDTests.cmake @@ -16,8 +16,6 @@ ############################################################################## ############################################################################## -H5_SET_VFD_LIST() - ############################################################################## ############################################################################## ### T H E T E S T S M A C R O S ### diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index b3cf015..1a0e8b3 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -60,6 +60,7 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage) endif () endmacro () +# Initialize the list of VFDs to be used for testing and create a test folder for each VFD macro (H5_SET_VFD_LIST) set (VFD_LIST sec2 diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake index e557676..130b0bf 100644 --- a/test/CMakeVFDTests.cmake +++ b/test/CMakeVFDTests.cmake @@ -17,8 +17,7 @@ ############################################################################## # included from CMakeTests.cmake -H5_SET_VFD_LIST() - +# create more test folders for each VFD foreach (vfdtest ${VFD_LIST}) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles") file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files") diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake index 4cda27b..12df1e9 100644 --- a/testpar/CMakeVFDTests.cmake +++ b/testpar/CMakeVFDTests.cmake @@ -21,8 +21,6 @@ set (H5P_VFD_TESTS t_pflush2 ) -H5_SET_VFD_LIST() - macro (ADD_VFD_TEST vfdname resultcode) if (NOT HDF5_ENABLE_USING_MEMCHECKER) foreach (h5_test ${H5P_VFD_TESTS}) diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake index 6a70b85..b6e0bea 100644 --- a/tools/test/h5dump/CMakeVFDTests.cmake +++ b/tools/test/h5dump/CMakeVFDTests.cmake @@ -16,8 +16,6 @@ ############################################################################## ############################################################################## -H5_SET_VFD_LIST() - # -------------------------------------------------------------------- # Copy all the HDF5 files from the source directory into the test directory # -------------------------------------------------------------------- diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake index 78d752c..e50414f 100644 --- a/tools/test/h5repack/CMakeVFDTests.cmake +++ b/tools/test/h5repack/CMakeVFDTests.cmake @@ -16,8 +16,6 @@ ############################################################################## ############################################################################## -H5_SET_VFD_LIST() - ############################################################################## ############################################################################## ### T H E T E S T S M A C R O S ### |