diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-02-12 01:13:39 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-02-12 01:13:39 (GMT) |
| commit | 34508f0620363d90ef3f76b314d52e4b01c20a81 (patch) | |
| tree | af8054ab51fc5f4cc495882df9ed4343960586b9 /c++ | |
| parent | 65a820ae8981a84fe7fbac87c48482e9f82b35f4 (diff) | |
| parent | fa83ab9f7c7dd7966f475932325b5e3740810cfd (diff) | |
| download | hdf5-34508f0620363d90ef3f76b314d52e4b01c20a81.zip hdf5-34508f0620363d90ef3f76b314d52e4b01c20a81.tar.gz hdf5-34508f0620363d90ef3f76b314d52e4b01c20a81.tar.bz2 | |
Merge in latest from develop
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 () |