diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2014-11-13 22:32:19 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-11-13 22:32:19 (GMT) |
| commit | 7ec8fad9527258c9cd2fe1cfe11b0c07ad740804 (patch) | |
| tree | b07230692d7d9aa1417cbb33beabcc06347f6a5d /c++/test | |
| parent | 5818a3045d141a02668f3ecfb29268327bb683ec (diff) | |
| download | hdf5-7ec8fad9527258c9cd2fe1cfe11b0c07ad740804.zip hdf5-7ec8fad9527258c9cd2fe1cfe11b0c07ad740804.tar.gz hdf5-7ec8fad9527258c9cd2fe1cfe11b0c07ad740804.tar.bz2 | |
[svn-r25814] Bring revisions #25284 - #25434 from trunk to revise_chunks.
(Revision #25283 is skipped since it was backed out later on 11/3/2015.)
h5committested.
Diffstat (limited to 'c++/test')
| -rw-r--r-- | c++/test/CMakeTests.cmake | 1 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index 1048ee7..c725f69 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -60,6 +60,7 @@ if (HDF5_TEST_VFD) -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) endif (NOT HDF5_ENABLE_USING_MEMCHECKER) ENDMACRO (ADD_VFD_TEST) diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 621618e..49c08e4 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -509,7 +509,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ |