summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-07-28 13:05:07 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-07-28 13:05:07 (GMT)
commit3b4e7ab05250ac3e5c60d702735dae90883de686 (patch)
treeef4eb95bb967b3bb1159dbfcdc1ea79221de22bd /tools
parent099c7242fbdf698cbb13339bfc71f38b8f363dfe (diff)
downloadhdf5-3b4e7ab05250ac3e5c60d702735dae90883de686.zip
hdf5-3b4e7ab05250ac3e5c60d702735dae90883de686.tar.gz
hdf5-3b4e7ab05250ac3e5c60d702735dae90883de686.tar.bz2
Merge changes from dev
Diffstat (limited to 'tools')
-rw-r--r--tools/test/h5diff/testh5diff.sh.in1
-rw-r--r--tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err7
2 files changed, 0 insertions, 8 deletions
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index 6175b2a..b19a433 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -344,7 +344,6 @@ $SRC_H5DIFF_TESTFILES/h5diff_801.txt
$SRC_H5DIFF_TESTFILES/h5diff_90.txt
$SRC_H5DIFF_TESTFILES/h5diff_8625.txt
$SRC_H5DIFF_TESTFILES/h5diff_8639.txt
-$SRC_H5DIFF_TESTFILES/h5diff_reg.txt
$SRC_H5DIFF_TESTFILES/h5diff_v1.txt
$SRC_H5DIFF_TESTFILES/h5diff_v2.txt
$SRC_H5DIFF_TESTFILES/h5diff_v3.txt
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err b/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err
index d85a999..e72892d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err
+++ b/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err
@@ -1,8 +1 @@
h5format_convert error: unable to downgrade dataset "/DSET_ERR"
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
- #000: (file name) line (number) in h5trav_visit(): traverse failed
- major: Failure in tools library
- minor: error in function
- #001: (file name) line (number) in traverse(): H5Lvisit_by_name failed
- major: Failure in tools library
- minor: error in function