diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-15 19:57:45 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-15 19:57:45 (GMT) |
| commit | eaa8ab277491173b66d3b08ad74920547073e677 (patch) | |
| tree | 67d3b651dca4bcf84bb22fa8788508e366521525 /test | |
| parent | c3c60dc7b5d5104475748f9967135903e3974cc3 (diff) | |
| parent | f73103745e9b9165e9d399ddb5b9991d7fb2a9e5 (diff) | |
| download | hdf5-eaa8ab277491173b66d3b08ad74920547073e677.zip hdf5-eaa8ab277491173b66d3b08ad74920547073e677.tar.gz hdf5-eaa8ab277491173b66d3b08ad74920547073e677.tar.bz2 | |
Merge pull request #2270 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f73103745e9b9165e9d399ddb5b9991d7fb2a9e5':
HDFFV-11001 fix if block
HDFFV-11001 need to qualify all by parallel or serial types
HDDFV-11001 add note
HDFFV-11001 Add fine control over testing
Adjust regex for warnings
Update tools hid_t declarations with H5I_INVALID_HID
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/CMakeVFDTests.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c7a945e..77f9191 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -525,4 +525,6 @@ else () endif () set_target_properties (use_disable_mdc_flushes PROPERTIES FOLDER test) -include (CMakeTests.cmake) +if (HDF5_TEST_SERIAL) + include (CMakeTests.cmake) +endif () diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake index cf938f5..d4a5ddc 100644 --- a/test/CMakeVFDTests.cmake +++ b/test/CMakeVFDTests.cmake @@ -15,7 +15,7 @@ ### T E S T I N G ### ############################################################################## ############################################################################## -# included from CMakeTEsts.cmake +# included from CMakeTests.cmake set (VFD_LIST sec2 |