diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-04-07 13:15:31 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-04-07 13:15:31 (GMT) |
| commit | 1f2db88a88be64145e4fbb6d6c48fa754613034b (patch) | |
| tree | 96407a4c0d016eb590768df4c402cc00c1802568 /c++ | |
| parent | 5c4aeef7ff5845a98f4fea5d2be74aa258cd1562 (diff) | |
| parent | 51e3309491efb4f8a21f23ef5d00b3b5138b7905 (diff) | |
| download | hdf5-1f2db88a88be64145e4fbb6d6c48fa754613034b.zip hdf5-1f2db88a88be64145e4fbb6d6c48fa754613034b.tar.gz hdf5-1f2db88a88be64145e4fbb6d6c48fa754613034b.tar.bz2 | |
Merge pull request #404 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit '51e3309491efb4f8a21f23ef5d00b3b5138b7905': (25 commits)
Add missing test status
HDFFV-10143 branch does not have HDprintf
Fix typo deletion
HDFFV-10143 Update new feature section.
HDFFV-10143 clean up format and function return
Update with checks for index bounds
Correct usuage of HD prefix
FIX pkg include error
HDFFV-10143 fix use before set
HDFFV-10143 check for H5PL_PACKAGE in 1.8
HDFFV-10143 surround will fail with try block
HDFFV-10143 typo cleanup
HDFFV-10143 typo removed
Fix code error and use H5PL_MAX_PATH_NUM in test
HDFFV-10143 Cleanup due to comments
HDFFV-10143 remove debugging output
HDFFV-10143 change h5PLget to use buffer like H5Iget_name
HDFFV-10143 change put to replace and add const
Remove redundant code
HDFFV-10143 Use Windows A version of ExpandEnvironmentStrings
...
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 |