diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | release_docs/INSTALL_CMake.txt | 2 | ||||
| -rw-r--r-- | test/CMakePassthroughVOLTests.cmake (renamed from test/CMakeVOLTests.cmake) | 2 | ||||
| -rw-r--r-- | test/CMakeTests.cmake | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f1489c1..06ff1f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -772,11 +772,11 @@ if (BUILD_TESTING) mark_as_advanced (HDF5_TEST_FHEAP_VFD) endif () - option (HDF5_TEST_VOL "Execute tests with different VOL connectors" OFF) - mark_as_advanced (HDF5_TEST_VOL) - if (HDF5_TEST_VOL) - option (HDF5_TEST_FHEAP_VOL "Execute fheap test with different VOL connectors" ON) - mark_as_advanced (HDF5_TEST_FHEAP_VOL) + option (HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF) + mark_as_advanced (HDF5_TEST_PASSTHROUGH_VOL) + if (HDF5_TEST_PASSTHROUGH_VOL) + option (HDF5_TEST_FHEAP_PASSTHROUGH_VOL "Execute fheap test with different passthrough VOL connectors" ON) + mark_as_advanced (HDF5_TEST_FHEAP_PASSTHROUGH VOL) endif () option (HDF_TEST_EXPRESS "Control testing framework (0-3)" "0") @@ -3338,9 +3338,9 @@ ./hl/tools/h5watch/CMakeTests.cmake ./src/CMakeLists.txt ./test/CMakeLists.txt +./test/CMakePassthroughVOLTests.cmake ./test/CMakeTests.cmake ./test/CMakeVFDTests.cmake -./test/CMakeVOLTests.cmake ./test/flushrefreshTest.cmake ./test/ShellTests.cmake ./testpar/CMakeLists.txt diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index 7505196..f61f016 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -651,7 +651,7 @@ HDF5_PACKAGE_EXTLIBS "CPACK - include external libraries" HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF HDF_TEST_EXPRESS "Control testing framework (0-3)" "0" HDF5_TEST_VFD "Execute tests with different VFDs" OFF -HDF5_TEST_VOL "Execute tests with different VOL connectors" OFF +HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF SKIP_ERROR_STACK_TESTS "Skip tests that check the error stack" OFF HDF5_USE_16_API_DEFAULT "Use the HDF5 1.6.x API by default" OFF HDF5_USE_18_API_DEFAULT "Use the HDF5 1.8.x API by default" OFF diff --git a/test/CMakeVOLTests.cmake b/test/CMakePassthroughVOLTests.cmake index cf47291..8c7d797 100644 --- a/test/CMakeVOLTests.cmake +++ b/test/CMakePassthroughVOLTests.cmake @@ -340,7 +340,7 @@ endif () set_tests_properties (VOL-${volname}-cache-shared PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}) endif () endif () - if (HDF5_TEST_FHEAP_VOL) + if (HDF5_TEST_FHEAP_PASSTHROUGH_VOL) add_test ( NAME VOL-${volname}-fheap-clear-objects COMMAND ${CMAKE_COMMAND} diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index c606eb1..fa6507a 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -1149,8 +1149,8 @@ endif () ############################################################################## ############################################################################## -if (HDF5_TEST_VOL) - include (CMakeVOLTests.cmake) +if (HDF5_TEST_PASSTHROUGH_VOL) + include (CMakePassthroughVOLTests.cmake) endif () ############################################################################## |