summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-04-15 18:43:16 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-04-15 18:43:16 (GMT)
commit5d3d1da9272a0d7fb4028839c3e146bc63fbcb5a (patch)
tree791160c644d035019e7f7797876aa0ae54e6e0d2 /test
parent5696c02a3cceec73cfb404b7415ca33ca1a48718 (diff)
parent9ee3d472113fc3e66ef34e40a0990ed07a2824bc (diff)
downloadhdf5-5d3d1da9272a0d7fb4028839c3e146bc63fbcb5a.zip
hdf5-5d3d1da9272a0d7fb4028839c3e146bc63fbcb5a.tar.gz
hdf5-5d3d1da9272a0d7fb4028839c3e146bc63fbcb5a.tar.bz2
Merge pull request #1652 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:check_passthrough_vol to develop
* commit '9ee3d472113fc3e66ef34e40a0990ed07a2824bc': Renamed the HDF5_TEST_VOL option to HDF5_TEST_PASSTHROUGH_VOL. Renamed the autotools check-vol target to check-passthrough-vol.
Diffstat (limited to 'test')
-rw-r--r--test/CMakePassthroughVOLTests.cmake (renamed from test/CMakeVOLTests.cmake)2
-rw-r--r--test/CMakeTests.cmake4
2 files changed, 3 insertions, 3 deletions
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 ()
##############################################################################