diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-02-07 18:07:26 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-02-07 18:07:26 (GMT) |
commit | 865e35ea01731ab1f49187468f590cd0136ef78b (patch) | |
tree | 030cb77ea6086eb5d6fc5e21f9abcf8baaa17df0 /c++ | |
parent | c7977ec2f896d933d59101db4c0f67ccce1fb62f (diff) | |
parent | 36e3d1600a3f9d771cfb9b4475f23c57d4b10280 (diff) | |
download | hdf5-865e35ea01731ab1f49187468f590cd0136ef78b.zip hdf5-865e35ea01731ab1f49187468f590cd0136ef78b.tar.gz hdf5-865e35ea01731ab1f49187468f590cd0136ef78b.tar.bz2 |
Merge pull request #1524 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '36e3d1600a3f9d771cfb9b4475f23c57d4b10280':
Refactor out timeout values
Correct name of variable
Remove F2003 Option and references
Remove obsolete file
Update examples version
Update to example reference version
Switch OFF if compression source is not available
Fail configure if SZIP/ZLIB is requested but not found
Diffstat (limited to 'c++')
-rw-r--r-- | c++/test/CMakeVFDTests.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake index 996a20f..6a8ce2c 100644 --- a/c++/test/CMakeVFDTests.cmake +++ b/c++/test/CMakeVFDTests.cmake @@ -55,7 +55,7 @@ -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects) - set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT 30) + set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT}) endif () endmacro () |