diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2003-10-30 17:15:56 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2003-10-30 17:15:56 (GMT) |
| commit | 4cb9330435224b2cf5f13749299ab87b888d7220 (patch) | |
| tree | 01e68f363550aa0ba6729855d739e6b951eb415d /tools/testfiles | |
| parent | 46646fc6548090c2c88d96fb4991165885b1a223 (diff) | |
| download | hdf5-4cb9330435224b2cf5f13749299ab87b888d7220.zip hdf5-4cb9330435224b2cf5f13749299ab87b888d7220.tar.gz hdf5-4cb9330435224b2cf5f13749299ab87b888d7220.tar.bz2 | |
[svn-r7793] Purpose:
h5diff new features
Description:
added the diff for variable lenght, opaque, enum, and bitfield datasets
Solution:
Platforms tested:
linux
solaris 2.7
IRIX
Misc. update:
Diffstat (limited to 'tools/testfiles')
30 files changed, 76 insertions, 166 deletions
diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt index efa6018..eba6de1 100644 --- a/tools/testfiles/h5diff_11.txt +++ b/tools/testfiles/h5diff_11.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset3a dset3b Comparing </dset3b> with </dset3b> 0 differences found - diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt index 80614c0..5fbd117 100644 --- a/tools/testfiles/h5diff_12.txt +++ b/tools/testfiles/h5diff_12.txt @@ -9,4 +9,3 @@ position dset1 dset2 difference [ 1 0 ] 1 1.01 0.01 2 differences found - diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index 9fd8953..9d85608 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -13,4 +13,3 @@ position dset3 dset4 difference [ 2 1 ] 100 200 100 6 differences found - diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index a20dd19..c69557c 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -13,4 +13,3 @@ position dset3 dset4 difference relative [ 2 1 ] 100 200 100 1 6 differences found - diff --git a/tools/testfiles/h5diff_20.txt b/tools/testfiles/h5diff_20.txt index 426db99..8403eed 100644 --- a/tools/testfiles/h5diff_20.txt +++ b/tools/testfiles/h5diff_20.txt @@ -5,4 +5,3 @@ $h5diff file3.h5 file3.h5 -v dset group Comparison not supported </group> is of type H5G_GROUP and </group> is of type H5G_GROUP - diff --git a/tools/testfiles/h5diff_21.txt b/tools/testfiles/h5diff_21.txt index 626dbc6..31b103e 100644 --- a/tools/testfiles/h5diff_21.txt +++ b/tools/testfiles/h5diff_21.txt @@ -5,4 +5,3 @@ $h5diff file3.h5 file3.h5 -v dset link Comparison not supported </link> is of type H5G_LINK and </link> is of type H5G_LINK - diff --git a/tools/testfiles/h5diff_22.txt b/tools/testfiles/h5diff_22.txt index 8001fc1..ac367bc 100644 --- a/tools/testfiles/h5diff_22.txt +++ b/tools/testfiles/h5diff_22.txt @@ -5,4 +5,3 @@ $h5diff file3.h5 file3.h5 -v dset type Comparison not supported </type> is of type H5G_TYPE and </type> is of type H5G_TYPE - diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt index 9f4394f..d3796e7 100644 --- a/tools/testfiles/h5diff_23.txt +++ b/tools/testfiles/h5diff_23.txt @@ -5,4 +5,3 @@ $h5diff file3.h5 file3.h5 -v group group Comparison not supported </group> is of type H5G_GROUP and </group> is of type H5G_GROUP - diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt index c7235f2..228d857 100644 --- a/tools/testfiles/h5diff_24.txt +++ b/tools/testfiles/h5diff_24.txt @@ -5,4 +5,3 @@ $h5diff file3.h5 file3.h5 -v type type Comparison not supported </type> is of type H5G_TYPE and </type> is of type H5G_TYPE - diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt index 7ca5f6e..56ea44e 100644 --- a/tools/testfiles/h5diff_25.txt +++ b/tools/testfiles/h5diff_25.txt @@ -5,4 +5,3 @@ $h5diff file3.h5 file3.h5 -v link link Comparison not supported </link> is of type H5G_LINK and </link> is of type H5G_LINK - diff --git a/tools/testfiles/h5diff_30.txt b/tools/testfiles/h5diff_30.txt index d0a072e..ba70578 100644 --- a/tools/testfiles/h5diff_30.txt +++ b/tools/testfiles/h5diff_30.txt @@ -16,24 +16,15 @@ file1 file2 x x /string x x /vlen - -Comparison not supported -</bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD - - -Comparison not supported -</enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM - - - -Comparison not supported -</opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE - +</array> and </array> are empty datasets +</bitfield> and </bitfield> are empty datasets +</compound> and </compound> are empty datasets +</enum> and </enum> are empty datasets +</float> and </float> are empty datasets +</integer> and </integer> are empty datasets +</opaque> and </opaque> are empty datasets Comparison not supported </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE - - -Comparison not supported -</vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN - +</string> and </string> are empty datasets +</vlen> and </vlen> are empty datasets diff --git a/tools/testfiles/h5diff_31.txt b/tools/testfiles/h5diff_31.txt index 18b51fc..93cac4e 100644 --- a/tools/testfiles/h5diff_31.txt +++ b/tools/testfiles/h5diff_31.txt @@ -16,24 +16,15 @@ file1 file2 x x /string x x /vlen - -Comparison not supported -</bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD - - -Comparison not supported -</enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM - - - -Comparison not supported -</opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE - +</array> and </array> are empty datasets +</bitfield> and </bitfield> are empty datasets +</compound> and </compound> are empty datasets +</enum> and </enum> are empty datasets +</float> and </float> are empty datasets +</integer> and </integer> are empty datasets +</opaque> and </opaque> are empty datasets Comparison not supported </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE - - -Comparison not supported -</vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN - +</string> and </string> are empty datasets +</vlen> and </vlen> are empty datasets diff --git a/tools/testfiles/h5diff_32.txt b/tools/testfiles/h5diff_32.txt index 904bd5b..e9e14d8 100644 --- a/tools/testfiles/h5diff_32.txt +++ b/tools/testfiles/h5diff_32.txt @@ -16,24 +16,15 @@ file1 file2 x x /string x x /vlen - -Comparison not supported -</bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD - - -Comparison not supported -</enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM - - - -Comparison not supported -</opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE - +</array> and </array> are empty datasets +</bitfield> and </bitfield> are empty datasets +</compound> and </compound> are empty datasets +</enum> and </enum> are empty datasets +</float> and </float> are empty datasets +</integer> and </integer> are empty datasets +</opaque> and </opaque> are empty datasets Comparison not supported </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE - - -Comparison not supported -</vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN - +</string> and </string> are empty datasets +</vlen> and </vlen> are empty datasets diff --git a/tools/testfiles/h5diff_33.txt b/tools/testfiles/h5diff_33.txt index 3829c25..549db5e 100644 --- a/tools/testfiles/h5diff_33.txt +++ b/tools/testfiles/h5diff_33.txt @@ -16,24 +16,15 @@ file1 file2 x x /string x x /vlen - -Comparison not supported -</bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD - - -Comparison not supported -</enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM - - - -Comparison not supported -</opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE - +</array> and </array> are empty datasets +</bitfield> and </bitfield> are empty datasets +</compound> and </compound> are empty datasets +</enum> and </enum> are empty datasets +</float> and </float> are empty datasets +</integer> and </integer> are empty datasets +</opaque> and </opaque> are empty datasets Comparison not supported </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE - - -Comparison not supported -</vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN - +</string> and </string> are empty datasets +</vlen> and </vlen> are empty datasets diff --git a/tools/testfiles/h5diff_34.txt b/tools/testfiles/h5diff_34.txt index 9261800..7c4b9c4 100644 --- a/tools/testfiles/h5diff_34.txt +++ b/tools/testfiles/h5diff_34.txt @@ -16,24 +16,15 @@ file1 file2 x x /string x x /vlen - -Comparison not supported -</bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD - - -Comparison not supported -</enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM - - - -Comparison not supported -</opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE - +</array> and </array> are empty datasets +</bitfield> and </bitfield> are empty datasets +</compound> and </compound> are empty datasets +</enum> and </enum> are empty datasets +</float> and </float> are empty datasets +</integer> and </integer> are empty datasets +</opaque> and </opaque> are empty datasets Comparison not supported </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE - - -Comparison not supported -</vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN - +</string> and </string> are empty datasets +</vlen> and </vlen> are empty datasets diff --git a/tools/testfiles/h5diff_35.txt b/tools/testfiles/h5diff_35.txt index 5b18d3f..a111a2f 100644 --- a/tools/testfiles/h5diff_35.txt +++ b/tools/testfiles/h5diff_35.txt @@ -16,24 +16,15 @@ file1 file2 x x /string x x /vlen - -Comparison not supported -</bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD - - -Comparison not supported -</enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM - - - -Comparison not supported -</opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE - +</array> and </array> are empty datasets +</bitfield> and </bitfield> are empty datasets +</compound> and </compound> are empty datasets +</enum> and </enum> are empty datasets +</float> and </float> are empty datasets +</integer> and </integer> are empty datasets +</opaque> and </opaque> are empty datasets Comparison not supported </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE - - -Comparison not supported -</vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN - +</string> and </string> are empty datasets +</vlen> and </vlen> are empty datasets diff --git a/tools/testfiles/h5diff_36.txt b/tools/testfiles/h5diff_36.txt index 01f6c07..da9257b 100644 --- a/tools/testfiles/h5diff_36.txt +++ b/tools/testfiles/h5diff_36.txt @@ -16,24 +16,15 @@ file1 file2 x x /string x x /vlen - -Comparison not supported -</bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD - - -Comparison not supported -</enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM - - - -Comparison not supported -</opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE - +</array> and </array> are empty datasets +</bitfield> and </bitfield> are empty datasets +</compound> and </compound> are empty datasets +</enum> and </enum> are empty datasets +</float> and </float> are empty datasets +</integer> and </integer> are empty datasets +</opaque> and </opaque> are empty datasets Comparison not supported </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE - - -Comparison not supported -</vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN - +</string> and </string> are empty datasets +</vlen> and </vlen> are empty datasets diff --git a/tools/testfiles/h5diff_37.txt b/tools/testfiles/h5diff_37.txt index ce746a8..08e2309 100644 --- a/tools/testfiles/h5diff_37.txt +++ b/tools/testfiles/h5diff_37.txt @@ -16,24 +16,15 @@ file1 file2 x x /string x x /vlen - -Comparison not supported -</bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD - - -Comparison not supported -</enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM - - - -Comparison not supported -</opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE - +</array> and </array> are empty datasets +</bitfield> and </bitfield> are empty datasets +</compound> and </compound> are empty datasets +</enum> and </enum> are empty datasets +</float> and </float> are empty datasets +</integer> and </integer> are empty datasets +</opaque> and </opaque> are empty datasets Comparison not supported </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE - - -Comparison not supported -</vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN - +</string> and </string> are empty datasets +</vlen> and </vlen> are empty datasets diff --git a/tools/testfiles/h5diff_38.txt b/tools/testfiles/h5diff_38.txt index 82472e3..35e3b62 100644 --- a/tools/testfiles/h5diff_38.txt +++ b/tools/testfiles/h5diff_38.txt @@ -2,5 +2,5 @@ Expected output for 'h5diff file4.h5 file4.h5 -v integer float' ############################# $h5diff file4.h5 file4.h5 -v integer float - +</float> and </float> are empty datasets diff --git a/tools/testfiles/h5diff_40.txt b/tools/testfiles/h5diff_40.txt index 72d2e7d..bdc17e6 100644 --- a/tools/testfiles/h5diff_40.txt +++ b/tools/testfiles/h5diff_40.txt @@ -2,5 +2,5 @@ Expected output for 'h5diff file5.h5 file5.h5 -v dset1 dset2' ############################# $h5diff file5.h5 file5.h5 -v dset1 dset2 - +</dset2> and </dset2> are empty datasets diff --git a/tools/testfiles/h5diff_41.txt b/tools/testfiles/h5diff_41.txt index f2dbd25..5e93e43 100644 --- a/tools/testfiles/h5diff_41.txt +++ b/tools/testfiles/h5diff_41.txt @@ -2,5 +2,5 @@ Expected output for 'h5diff file5.h5 file5.h5 -v dset3 dset4' ############################# $h5diff file5.h5 file5.h5 -v dset3 dset4 - +</dset4> and </dset4> are empty datasets diff --git a/tools/testfiles/h5diff_42.txt b/tools/testfiles/h5diff_42.txt index b71acd0..4614668 100644 --- a/tools/testfiles/h5diff_42.txt +++ b/tools/testfiles/h5diff_42.txt @@ -2,5 +2,5 @@ Expected output for 'h5diff file5.h5 file5.h5 -v dset5 dset6' ############################# $h5diff file5.h5 file5.h5 -v dset5 dset6 - +</dset6> and </dset6> are empty datasets diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index e470a0a..2b4a547 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset0a dset0b Comparing </dset0b> with </dset0b> 0 differences found - diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index eace500..8c98dc9 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset1a dset1b Comparing </dset1b> with </dset1b> 0 differences found - diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index f662282..b148a45 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset2a dset2b Comparing </dset2b> with </dset2b> 0 differences found - diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index 90819a8..f34c172 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset3a dset4b Comparing </dset4b> with </dset4b> 0 differences found - diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index a8d82e9..eba9116 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset4a dset4b Comparing </dset4b> with </dset4b> 0 differences found - diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index ddb9531..2b9f24f 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset5a dset5b Comparing </dset5b> with </dset5b> 0 differences found - diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index c452459..d37dd59 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset6a dset6b Comparing </dset6b> with </dset6b> 0 differences found - diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt index 654b4df..67dfad1 100644 --- a/tools/testfiles/h5diff_57.txt +++ b/tools/testfiles/h5diff_57.txt @@ -5,4 +5,3 @@ $h5diff file6.h5 file6.h5 -v dset7a dset7b Comparing </dset7b> with </dset7b> 0 differences found - |