diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-03-29 21:44:23 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-03-29 21:44:23 (GMT) |
| commit | ba2cfde1fda880bf9d4b18dd439100ee5c4680bb (patch) | |
| tree | b071863eb782a1ad32e161a60197f33e30cdf5be /c++ | |
| parent | 096aac122ed6b6e8d07a30330bd95992887cd2be (diff) | |
| download | hdf5-ba2cfde1fda880bf9d4b18dd439100ee5c4680bb.zip hdf5-ba2cfde1fda880bf9d4b18dd439100ee5c4680bb.tar.gz hdf5-ba2cfde1fda880bf9d4b18dd439100ee5c4680bb.tar.bz2 | |
Merge/port changes from develop back to 1.8 for tools and cmake
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/test/CMakeTests.cmake | 4 | ||||
| -rw-r--r-- | c++/test/tlinks.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index cf07ab3..7ffabb2 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -50,7 +50,7 @@ if (HDF5_TEST_VFD) set (VFD_LIST ${VFD_LIST} direct) endif () - MACRO (ADD_VFD_TEST vfdname resultcode) + macro (ADD_VFD_TEST vfdname resultcode) if (NOT HDF5_ENABLE_USING_MEMCHECKER) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}") add_test ( @@ -78,7 +78,7 @@ if (HDF5_TEST_VFD) 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 () - ENDMACRO () + endmacro () # Run test with different Virtual File Driver foreach (vfd ${VFD_LIST}) diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp index 2b05764..03fe02e 100644 --- a/c++/test/tlinks.cpp +++ b/c++/test/tlinks.cpp @@ -615,7 +615,7 @@ void test_links() /* Close 2nd FAPL */ H5Pclose(fapl2_id); - h5_cleanup(FILENAME, fapl_id); + h5_clean_files(FILENAME, fapl_id); /* Test that external links can be used after a library reset. MUST be * called last so the reset doesn't interfere with the property lists. This |