summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2015-08-31 20:08:56 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2015-08-31 20:08:56 (GMT)
commit81ca9e4c79a125cfcea9e426e1e91d94cdf6a2aa (patch)
treeafb20a611c0582221ce101eb67c5c699f2399ab4 /CMakeLists.txt
parentc226e58005f54b29dc9fc5f762f7aa6382e790ff (diff)
downloadhdf5-81ca9e4c79a125cfcea9e426e1e91d94cdf6a2aa.zip
hdf5-81ca9e4c79a125cfcea9e426e1e91d94cdf6a2aa.tar.gz
hdf5-81ca9e4c79a125cfcea9e426e1e91d94cdf6a2aa.tar.bz2
[svn-r27627] Change hardcoded HDF5TESTEXPRESS value to use a CMake variable HDF_TEST_EXPRESS.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt25
1 files changed, 15 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c75114e..cd3e1c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -614,8 +614,23 @@ if (BUILD_TESTING)
CACHE INTEGER
"Timeout in seconds for each test (default 1200=20minutes)"
)
+
+ option (HDF5_TEST_VFD "Execute tests with different VFDs" OFF)
+ mark_as_advanced (HDF5_TEST_VFD)
+ if (HDF5_TEST_VFD)
+ option (HDF5_TEST_FHEAP_VFD "Execute tests with different VFDs" ON)
+ mark_as_advanced (HDF5_TEST_FHEAP_VFD)
+ endif (HDF5_TEST_VFD)
+
+ option (HDF_TEST_EXPRESS "Control testing framework (0-3)" "0")
+ mark_as_advanced (HDF_TEST_EXPRESS)
+
+ include (${HDF5_SOURCE_DIR}/CTestConfig.cmake)
+ configure_file (${HDF_RESOURCES_DIR}/CTestCustom.cmake ${HDF5_BINARY_DIR}/CTestCustom.ctest @ONLY)
+
enable_testing ()
include (CTest)
+
if (NOT HDF5_EXTERNALLY_CONFIGURED)
if (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
add_subdirectory (${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib)
@@ -627,16 +642,6 @@ if (BUILD_TESTING)
endif (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
endif (H5_HAVE_PARALLEL)
endif (NOT HDF5_EXTERNALLY_CONFIGURED)
-
- option (HDF5_TEST_VFD "Execute tests with different VFDs" OFF)
- mark_as_advanced (HDF5_TEST_VFD)
- if (HDF5_TEST_VFD)
- option (HDF5_TEST_FHEAP_VFD "Execute tests with different VFDs" ON)
- mark_as_advanced (HDF5_TEST_FHEAP_VFD)
- endif (HDF5_TEST_VFD)
-
- include (${HDF5_SOURCE_DIR}/CTestConfig.cmake)
- configure_file (${HDF_RESOURCES_DIR}/CTestCustom.cmake ${HDF5_BINARY_DIR}/CTestCustom.ctest @ONLY)
endif (BUILD_TESTING)
#-----------------------------------------------------------------------------