diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2004-06-10 15:12:34 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2004-06-10 15:12:34 (GMT) |
| commit | 2a7d7e5121587291d551460275d3b8e1e8daee49 (patch) | |
| tree | fdbb2f42890cc07b2f0d188c402844cf2e170f48 | |
| parent | 02d3fef648a826cfdce26d40587b34f463bdc8b1 (diff) | |
| download | hdf5-2a7d7e5121587291d551460275d3b8e1e8daee49.zip hdf5-2a7d7e5121587291d551460275d3b8e1e8daee49.tar.gz hdf5-2a7d7e5121587291d551460275d3b8e1e8daee49.tar.bz2 | |
[svn-r8642] Purpose:
bug fix
Description:
one of the h5diff tests was reading the wrong hdf5 file
Solution:
substituted for the correct file
Platforms tested:
linux (small change)
Misc. update:
26 files changed, 181 insertions, 126 deletions
diff --git a/tools/testfiles/file1.h5 b/tools/testfiles/file1.h5 Binary files differindex 11cd7b4..14863a3 100644 --- a/tools/testfiles/file1.h5 +++ b/tools/testfiles/file1.h5 diff --git a/tools/testfiles/file2.h5 b/tools/testfiles/file2.h5 Binary files differindex 432d412..5c569a0 100644 --- a/tools/testfiles/file2.h5 +++ b/tools/testfiles/file2.h5 diff --git a/tools/testfiles/file3.h5 b/tools/testfiles/file3.h5 Binary files differindex 2f63b47..8fcd803 100644 --- a/tools/testfiles/file3.h5 +++ b/tools/testfiles/file3.h5 diff --git a/tools/testfiles/file4.h5 b/tools/testfiles/file4.h5 Binary files differindex c4e511f..29369c0 100644 --- a/tools/testfiles/file4.h5 +++ b/tools/testfiles/file4.h5 diff --git a/tools/testfiles/file5.h5 b/tools/testfiles/file5.h5 Binary files differindex a1137f2..e5c0c96 100644 --- a/tools/testfiles/file5.h5 +++ b/tools/testfiles/file5.h5 diff --git a/tools/testfiles/file6.h5 b/tools/testfiles/file6.h5 Binary files differindex bb9c043..a65c081 100644 --- a/tools/testfiles/file6.h5 +++ b/tools/testfiles/file6.h5 diff --git a/tools/testfiles/file7.h5 b/tools/testfiles/file7.h5 Binary files differindex 3f891d9..d7f03b2 100644 --- a/tools/testfiles/file7.h5 +++ b/tools/testfiles/file7.h5 diff --git a/tools/testfiles/file8.h5 b/tools/testfiles/file8.h5 Binary files differindex 2590a1b..f21783d 100644 --- a/tools/testfiles/file8.h5 +++ b/tools/testfiles/file8.h5 diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt index d0c1aad..73fe62f 100644 --- a/tools/testfiles/h5diff_11.txt +++ b/tools/testfiles/h5diff_11.txt @@ -7,4 +7,3 @@ position dset1 dset2 difference [ 1 0 ] 1.000000 1.010000 0.010000 [ 1 1 ] 1.000000 1.001000 0.001000 [ 2 0 ] 1.000000 1.000100 0.000100 -[ 2 1 ] 1.000000 1.000000 0.000000 diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index 2ad177b..961c652 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -3,5 +3,5 @@ Expected output for 'h5diff file1.h5 file2.h5 -v -r g1/dset1 g1/dset2' ############################# $h5diff file1.h5 file2.h5 -v -r g1/dset1 g1/dset2 Dataset: </g1/dset1> and </g1/dset2> -5 differences found +4 differences found diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt index a71a14f..a397ae4 100644 --- a/tools/testfiles/h5diff_16.txt +++ b/tools/testfiles/h5diff_16.txt @@ -7,4 +7,3 @@ position dset1 dset1 difference [ 1 0 ] 1.000000 1.010000 0.010000 [ 1 1 ] 1.000000 1.001000 0.001000 [ 2 0 ] 1.000000 1.000100 0.000100 -[ 2 1 ] 1.000000 1.000000 0.000000 diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index 7a9866e..9fc3c7f 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -2,6 +2,18 @@ Expected output for 'h5diff file4.h5 file4.h5 -v dset0a dset0b' ############################# $h5diff file4.h5 file4.h5 -v dset0a dset0b -Object <dset0a> could not be found in <file4.h5> -Object <dset0b> could not be found in <file4.h5> +Dataset: </dset0a> and </dset0b> +Warning: Different storage datatype +</dset0a> has file datatype H5T_STD_I16LE +</dset0b> has file datatype H5T_STD_I32LE +Warning: Different storage datatype +</dset0a> has file datatype H5T_STD_I16LE +</dset0b> has file datatype H5T_STD_I32LE +position dset0a dset0b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index 6e3f3de..858ace2 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -2,6 +2,12 @@ Expected output for 'h5diff file4.h5 file4.h5 -v dset1a dset1b' ############################# $h5diff file4.h5 file4.h5 -v dset1a dset1b -Object <dset1a> could not be found in <file4.h5> -Object <dset1b> could not be found in <file4.h5> +Dataset: </dset1a> and </dset1b> +position dset1a dset1b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index c235f43..d3999ad 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -2,6 +2,12 @@ Expected output for 'h5diff file4.h5 file4.h5 -v dset2a dset2b' ############################# $h5diff file4.h5 file4.h5 -v dset2a dset2b -Object <dset2a> could not be found in <file4.h5> -Object <dset2b> could not be found in <file4.h5> +Dataset: </dset2a> and </dset2b> +position dset2a dset2b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index eab744d..e7e899e 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -2,6 +2,12 @@ Expected output for 'h5diff file4.h5 file4.h5 -v dset3a dset4b' ############################# $h5diff file4.h5 file4.h5 -v dset3a dset4b -Object <dset3a> could not be found in <file4.h5> -Object <dset4b> could not be found in <file4.h5> +Dataset: </dset3a> and </dset4b> +position dset3a dset4b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index 23397aa..bd21628 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -2,6 +2,12 @@ Expected output for 'h5diff file4.h5 file4.h5 -v dset4a dset4b' ############################# $h5diff file4.h5 file4.h5 -v dset4a dset4b -Object <dset4a> could not be found in <file4.h5> -Object <dset4b> could not be found in <file4.h5> +Dataset: </dset4a> and </dset4b> +position dset4a dset4b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index 0f397c9..69de2c1 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -2,6 +2,12 @@ Expected output for 'h5diff file4.h5 file4.h5 -v dset5a dset5b' ############################# $h5diff file4.h5 file4.h5 -v dset5a dset5b -Object <dset5a> could not be found in <file4.h5> -Object <dset5b> could not be found in <file4.h5> +Dataset: </dset5a> and </dset5b> +position dset5a dset5b difference +------------------------------------------------------------ +[ 1 0 ] 1.000000 3.000000 2.000000 +[ 1 1 ] 1.000000 4.000000 3.000000 +[ 2 0 ] 1.000000 5.000000 4.000000 +[ 2 1 ] 1.000000 6.000000 5.000000 +4 differences found diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index 59fd5a2..0426f4d 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -2,6 +2,12 @@ Expected output for 'h5diff file4.h5 file4.h5 -v dset6a dset6b' ############################# $h5diff file4.h5 file4.h5 -v dset6a dset6b -Object <dset6a> could not be found in <file4.h5> -Object <dset6b> could not be found in <file4.h5> +Dataset: </dset6a> and </dset6b> +position dset6a dset6b difference +------------------------------------------------------------ +[ 1 0 ] 1.000000 3.000000 2.000000 +[ 1 1 ] 1.000000 4.000000 3.000000 +[ 2 0 ] 1.000000 5.000000 4.000000 +[ 2 1 ] 1.000000 6.000000 5.000000 +4 differences found diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt index 308eae0..6794e73 100644 --- a/tools/testfiles/h5diff_57.txt +++ b/tools/testfiles/h5diff_57.txt @@ -2,6 +2,12 @@ Expected output for 'h5diff file4.h5 file4.h5 -v dset7a dset7b' ############################# $h5diff file4.h5 file4.h5 -v dset7a dset7b -Object <dset7a> could not be found in <file4.h5> -Object <dset7b> could not be found in <file4.h5> +Dataset: </dset7a> and </dset7b> +Warning: Different storage datatype +</dset7a> has file datatype H5T_STD_I8LE +</dset7b> has file datatype H5T_STD_U8LE +Warning: Different storage datatype +</dset7a> has file datatype H5T_STD_I8LE +</dset7b> has file datatype H5T_STD_U8LE +Comparison not supported: </dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE diff --git a/tools/testfiles/tcontents.ddl b/tools/testfiles/tcontents.ddl index 7dcc1d4..4838c0a 100644 --- a/tools/testfiles/tcontents.ddl +++ b/tools/testfiles/tcontents.ddl @@ -6,18 +6,20 @@ FILE_CONTENTS { dataset /all dataset /bitfield dataset /char + dataset /chunked dataset /compact dataset /contiguous dataset /deflate dataset /enum dataset /external - dataset /fill early - dataset /fill ifset - dataset /fill never + dataset /fill_early + dataset /fill_ifset + dataset /fill_never dataset /fletcher32 - datatype /my type dataset /myfilter + datatype /mytype datatype /myvlen + dataset /reference dataset /shuffle dataset /string dataset /vlen diff --git a/tools/testfiles/tfilters.h5 b/tools/testfiles/tfilters.h5 Binary files differindex 80aff52..faf5e48 100644 --- a/tools/testfiles/tfilters.h5 +++ b/tools/testfiles/tfilters.h5 diff --git a/tools/testfiles/thlink-1.ddl b/tools/testfiles/thlink-1.ddl index 86da504..6603f32 100644 --- a/tools/testfiles/thlink-1.ddl +++ b/tools/testfiles/thlink-1.ddl @@ -12,16 +12,16 @@ GROUP "/" { } GROUP "g1" { DATASET "dset2" { - HARDLINK "/dset1" + HARDLINK "/g2/dset1" } GROUP "g1.1" { DATASET "dset3" { - HARDLINK "/dset1" + HARDLINK "/g2/dset1" } } } GROUP "g2" { - HARDLINK "/g1/g1.1" + HARDLINK "/g2/g1/g1.1" } } } diff --git a/tools/testfiles/tlarge_objname.ddl b/tools/testfiles/tlarge_objname.ddl index 0bbaa09..d3f0fbe 100644 --- a/tools/testfiles/tlarge_objname.ddl +++ b/tools/testfiles/tlarge_objname.ddl @@ -5,104 +5,104 @@ HDF5 "tlarge_objname.h5" { GROUP "/" { GROUP "this_is_a_large_group_name" { GROUP "this_is_a_large_group_name0" { - GROUP "this_is_a_large_group_name1" { - GROUP "this_is_a_large_group_name2" { - GROUP "this_is_a_large_group_name3" { - GROUP "this_is_a_large_group_name4" { - GROUP "this_is_a_large_group_name5" { - GROUP "this_is_a_large_group_name6" { - GROUP "this_is_a_large_group_name7" { - GROUP "this_is_a_large_group_name8" { - GROUP "this_is_a_large_group_name9" { - GROUP "this_is_a_large_group_name10" { - GROUP "this_is_a_large_group_name11" { - GROUP "this_is_a_large_group_name12" { - GROUP "this_is_a_large_group_name13" { - GROUP "this_is_a_large_group_name14" { - GROUP "this_is_a_large_group_name15" { - GROUP "this_is_a_large_group_name16" { - GROUP "this_is_a_large_group_name17" { - GROUP "this_is_a_large_group_name18" { - GROUP "this_is_a_large_group_name19" { - GROUP "this_is_a_large_group_name20" { - GROUP "this_is_a_large_group_name21" { - GROUP "this_is_a_large_group_name22" { - GROUP "this_is_a_large_group_name23" { - GROUP "this_is_a_large_group_name24" { - GROUP "this_is_a_large_group_name25" { - GROUP "this_is_a_large_group_name26" { - GROUP "this_is_a_large_group_name27" { - GROUP "this_is_a_large_group_name28" { - GROUP "this_is_a_large_group_name29" { - GROUP "this_is_a_large_group_name30" { - GROUP "this_is_a_large_group_name31" { - GROUP "this_is_a_large_group_name32" { - GROUP "this_is_a_large_group_name33" { - GROUP "this_is_a_large_group_name34" { - GROUP "this_is_a_large_group_name35" { - GROUP "this_is_a_large_group_name36" { - GROUP "this_is_a_large_group_name37" { - GROUP "this_is_a_large_group_name38" { - GROUP "this_is_a_large_group_name39" { - GROUP "this_is_a_large_group_name40" { - GROUP "this_is_a_large_group_name41" { - GROUP "this_is_a_large_group_name42" { - GROUP "this_is_a_large_group_name43" { - GROUP "this_is_a_large_group_name44" { - GROUP "this_is_a_large_group_name45" { - GROUP "this_is_a_large_group_name46" { - GROUP "this_is_a_large_group_name47" { - GROUP "this_is_a_large_group_name48" { - GROUP "this_is_a_large_group_name49" { - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } + } + GROUP "this_is_a_large_group_name1" { + } + GROUP "this_is_a_large_group_name10" { + } + GROUP "this_is_a_large_group_name11" { + } + GROUP "this_is_a_large_group_name12" { + } + GROUP "this_is_a_large_group_name13" { + } + GROUP "this_is_a_large_group_name14" { + } + GROUP "this_is_a_large_group_name15" { + } + GROUP "this_is_a_large_group_name16" { + } + GROUP "this_is_a_large_group_name17" { + } + GROUP "this_is_a_large_group_name18" { + } + GROUP "this_is_a_large_group_name19" { + } + GROUP "this_is_a_large_group_name2" { + } + GROUP "this_is_a_large_group_name20" { + } + GROUP "this_is_a_large_group_name21" { + } + GROUP "this_is_a_large_group_name22" { + } + GROUP "this_is_a_large_group_name23" { + } + GROUP "this_is_a_large_group_name24" { + } + GROUP "this_is_a_large_group_name25" { + } + GROUP "this_is_a_large_group_name26" { + } + GROUP "this_is_a_large_group_name27" { + } + GROUP "this_is_a_large_group_name28" { + } + GROUP "this_is_a_large_group_name29" { + } + GROUP "this_is_a_large_group_name3" { + } + GROUP "this_is_a_large_group_name30" { + } + GROUP "this_is_a_large_group_name31" { + } + GROUP "this_is_a_large_group_name32" { + } + GROUP "this_is_a_large_group_name33" { + } + GROUP "this_is_a_large_group_name34" { + } + GROUP "this_is_a_large_group_name35" { + } + GROUP "this_is_a_large_group_name36" { + } + GROUP "this_is_a_large_group_name37" { + } + GROUP "this_is_a_large_group_name38" { + } + GROUP "this_is_a_large_group_name39" { + } + GROUP "this_is_a_large_group_name4" { + } + GROUP "this_is_a_large_group_name40" { + } + GROUP "this_is_a_large_group_name41" { + } + GROUP "this_is_a_large_group_name42" { + } + GROUP "this_is_a_large_group_name43" { + } + GROUP "this_is_a_large_group_name44" { + } + GROUP "this_is_a_large_group_name45" { + } + GROUP "this_is_a_large_group_name46" { + } + GROUP "this_is_a_large_group_name47" { + } + GROUP "this_is_a_large_group_name48" { + } + GROUP "this_is_a_large_group_name49" { + } + GROUP "this_is_a_large_group_name5" { + } + GROUP "this_is_a_large_group_name6" { + } + GROUP "this_is_a_large_group_name7" { + } + GROUP "this_is_a_large_group_name8" { + } + GROUP "this_is_a_large_group_name9" { } } } diff --git a/tools/testfiles/tlarge_objname.h5 b/tools/testfiles/tlarge_objname.h5 Binary files differindex b6fc299..0c59387 100644 --- a/tools/testfiles/tlarge_objname.h5 +++ b/tools/testfiles/tlarge_objname.h5 diff --git a/tools/testfiles/tloop-1.ddl b/tools/testfiles/tloop-1.ddl index 8313887..c3d842a 100644 --- a/tools/testfiles/tloop-1.ddl +++ b/tools/testfiles/tloop-1.ddl @@ -6,12 +6,12 @@ GROUP "/" { GROUP "g1" { GROUP "g1.1" { GROUP "g2.1" { - HARDLINK "/g1" + HARDLINK "/g2/g1" } } } GROUP "g2" { - HARDLINK "/g1/g1.1" + HARDLINK "/g2/g1/g1.1" } } } diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl index 8326712..80a4d15 100644 --- a/tools/testfiles/tnofilename.ddl +++ b/tools/testfiles/tnofilename.ddl @@ -10,6 +10,7 @@ usage: h5dump [OPTIONS] file -A Print the header and value of attributes; data of datasets is not displayed -i, --object-ids Print the object ids -r, --string Print 1-byte integer datasets as ASCII + -e, Interpret carriage return (\n) as new line -V, --version Print version number and exit -a P, --attribute=P Print the specified attribute -d P, --dataset=P Print the specified dataset |