diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-07-26 14:12:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-07-26 14:12:04 (GMT) |
| commit | 8540b1d8fcfb188303c34f68f72d69df22518d54 (patch) | |
| tree | f6675312a2de50fb101e8531ba1c0e26601c8f97 /tools/test/h5diff/CMakeTests.cmake | |
| parent | 1fe3d5113aeedc4b67dae6b83984d1246c7a2701 (diff) | |
| parent | 08d63d17f9ba80f205d54bc6526cb709a81ff0cb (diff) | |
| download | hdf5-8540b1d8fcfb188303c34f68f72d69df22518d54.zip hdf5-8540b1d8fcfb188303c34f68f72d69df22518d54.tar.gz hdf5-8540b1d8fcfb188303c34f68f72d69df22518d54.tar.bz2 | |
Merge pull request #610 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '08d63d17f9ba80f205d54bc6526cb709a81ff0cb':
Add the release note
Correct copy to file name
HDFFV-10246 Add check for string not null before use
Correct case of var
Diffstat (limited to 'tools/test/h5diff/CMakeTests.cmake')
| -rw-r--r-- | tools/test/h5diff/CMakeTests.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index 72dda6b..02db446 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -95,6 +95,8 @@ ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5 ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5 ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5 + # tools/testfiles + ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 ) set (LIST_OTHER_TEST_FILES @@ -286,6 +288,7 @@ ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v1.txt ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v2.txt ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v3.txt + ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt ) set (LIST_WIN_TEST_FILES @@ -311,6 +314,8 @@ HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}" "h5diff_files") endif () endforeach () + # copy second version of tvlstr.h5 + HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files") # @@ -888,6 +893,8 @@ h5diff_v2.out.err h5diff_v3.out h5diff_v3.out.err + h5diff_vlstr.out + h5diff_vlstr.out.err ) set_tests_properties (H5DIFF-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") if (NOT "${last_test}" STREQUAL "") @@ -1465,6 +1472,7 @@ ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 # # diff various multiple vlen and fixed strings in a compound type dataset # ############################################################################## ADD_H5_TEST (h5diff_530 0 -v ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy) +ADD_H5_TEST (h5diff_vlstr 0 -v tvlstr.h5 tvlstr2.h5) # ############################################################################## # # Test container types (array,vlen) with multiple nested compound types |