diff options
33 files changed, 238 insertions, 237 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 9f20f4a..c7dd9e5 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -366,8 +366,10 @@ int diff( hid_t file1_id, break; } +#if 0 if (options->verbose) printf("\n"); +#endif return nfound; } diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 831edc9..b8d2a12 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -56,11 +56,18 @@ int diff_native_uchar(unsigned char *mem1, * * Date: May 30, 2003 * - * Modifications: October 29, 2003 + * Modifications: October 30, 2003 * Added support for H5T_COMPOUND types; to handle compounds a recursive * function is called. because of this , the data is compared datum by datum * instead of the previous cycle that compared all the array the native * types + * Added support for + * H5T_STRING + * H5T_BITFIELD + * H5T_OPAQUE + * H5T_ENUM + * H5T_VLEN + * H5T_ARRAY * *------------------------------------------------------------------------- */ @@ -79,6 +86,8 @@ int diff_array( void *_mem1, size_t size; /* size of datum */ unsigned char *mem1 = (unsigned char*)_mem1; unsigned char *mem2 = (unsigned char*)_mem2; + unsigned char *tmp1; + unsigned char *tmp2; int acc[32]; /* accumulator and matrix position */ int pos[32]; unsigned i; @@ -89,25 +98,48 @@ int diff_array( void *_mem1, { acc[j]=acc[j+1]*(int)dims[j+1]; } - - /* Get the size. */ - size = H5Tget_size( m_type ); - - for ( i = 0; i < nelmts; i++) + + + if(H5Tis_variable_str(m_type)) { - nfound+=diff_array_mem( - mem1 + i * size, - mem2 + i * size, /* offset */ + tmp1 = ((unsigned char**)mem1)[0]; + tmp2 = ((unsigned char**)mem2)[0]; + nfound+=diff_array_mem( + tmp1, + tmp2, m_type, - i, + 0, rank, acc, pos, options, name1, name2); - if (options->n && nfound>=options->count) - return nfound; + } + + else + + { + + /* get the size. */ + size = H5Tget_size( m_type ); + + for ( i = 0; i < nelmts; i++) + { + nfound+=diff_array_mem( + mem1 + i * size, + mem2 + i * size, /* offset */ + m_type, + i, + rank, + acc, + pos, + options, + name1, + name2); + if (options->n && nfound>=options->count) + return nfound; + } } return nfound; @@ -153,10 +185,11 @@ int diff_array_mem( void *_mem1, size_t offset; int nmembs; int j; - /* for H5T_ARRAY */ - hsize_t adims[H5S_MAX_RANK],anelmts,andims; - hid_t amemb_id; - size_t asize; + hsize_t dims[H5S_MAX_RANK]; + hsize_t nelmts; + hsize_t ndims; + size_t size; + /* Build default formats for long long types */ sprintf(fmt_llong, "%%%sd %%%sd %%%sd\n", @@ -178,6 +211,12 @@ int diff_array_mem( void *_mem1, default: assert(0); break; + case H5T_TIME: + assert(0); + break; + case H5T_REFERENCE: + assert(0); + break; /*------------------------------------------------------------------------- * H5T_COMPOUND *------------------------------------------------------------------------- @@ -188,40 +227,70 @@ int diff_array_mem( void *_mem1, { offset = H5Tget_member_offset(m_type, j); memb_type = H5Tget_member_type(m_type, j); - nfound+=diff_array_mem(mem1+offset, - mem2+offset, - memb_type, - i, - rank, - acc, - pos, - options, - obj1, - obj2); + nfound+=diff_array_mem( + mem1+offset, + mem2+offset, + memb_type, + i, + rank, + acc, + pos, + options, + obj1, + obj2); H5Tclose(memb_type); } break; - case H5T_TIME: - break; + /*------------------------------------------------------------------------- - * H5T_STRING + * H5T_STRING, H5T_BITFIELD, H5T_OPAQUE, H5T_REFERENCE, H5T_ENUM: *------------------------------------------------------------------------- */ case H5T_STRING: + + if(H5Tis_variable_str(m_type)) + type_size = HDstrlen(mem1); + else + type_size = H5Tget_size(m_type); + + for (u=0; u<type_size; u++) + nfound+=diff_native_uchar( + mem1 + u, + mem2 + u, /* offset */ + type_size, + u, + rank, + acc, + pos, + options, + obj1, + obj2, + ph); + + + break; + +/*------------------------------------------------------------------------- + * H5T_BITFIELD, H5T_OPAQUE, H5T_REFERENCE, H5T_ENUM: + *------------------------------------------------------------------------- + */ + case H5T_BITFIELD: + case H5T_OPAQUE: + case H5T_ENUM: for (u=0; u<type_size; u++) nfound+=diff_native_uchar( - mem1 + u, - mem2 + u, /* offset */ - type_size, - u, - rank, - acc, - pos, - options, - obj1, - obj2, - ph); + mem1 + u, + mem2 + u, /* offset */ + type_size, + u, + rank, + acc, + pos, + options, + obj1, + obj2, + ph); break; @@ -231,23 +300,20 @@ int diff_array_mem( void *_mem1, */ case H5T_ARRAY: /* get the array's base datatype for each element */ - amemb_id = H5Tget_super(m_type); - asize = H5Tget_size(amemb_id); - andims = H5Tget_array_ndims(m_type); - H5Tget_array_dims(m_type, adims, NULL); - assert(andims >= 1 && andims <= H5S_MAX_RANK); + memb_type = H5Tget_super(m_type); + size = H5Tget_size(memb_type); + ndims = H5Tget_array_ndims(m_type); + H5Tget_array_dims(m_type, dims, NULL); + assert(ndims >= 1 && ndims <= H5S_MAX_RANK); /* calculate the number of array elements */ - for (u = 0, anelmts = 1; u <andims; u++){ - anelmts *= adims[u]; - } - - for (u = 0; u < anelmts; u++) - { + for (u = 0, nelmts = 1; u <ndims; u++) + nelmts *= dims[u]; + for (u = 0; u < nelmts; u++) nfound+=diff_array_mem( - mem1+u*asize, - mem2+u*asize, - amemb_id, + mem1 + u * size, + mem2 + u * size, /* offset */ + memb_type, u, rank, acc, @@ -255,19 +321,37 @@ int diff_array_mem( void *_mem1, options, obj1, obj2); - } - H5Tclose(amemb_id); + H5Tclose(memb_type); break; - case H5T_BITFIELD: - break; - case H5T_OPAQUE: - break; - case H5T_REFERENCE: - break; - case H5T_ENUM: - break; +/*------------------------------------------------------------------------- + * H5T_VLEN + *------------------------------------------------------------------------- + */ case H5T_VLEN: + + /* get the VL sequences's base datatype for each element */ + memb_type = H5Tget_super(m_type); + size = H5Tget_size(memb_type); + + /* get the number of sequence elements */ + nelmts = ((hvl_t *)mem1)->len; + + for (j = 0; j < nelmts; j++) + nfound+=diff_array_mem( + ((char *)(((hvl_t *)mem1)->p)) + j * size, + ((char *)(((hvl_t *)mem2)->p)) + j * size, /* offset */ + memb_type, + j, + rank, + acc, + pos, + options, + obj1, + obj2); + + H5Tclose(memb_type); + break; case H5T_INTEGER: diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 0db6bf9..f40122e 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -162,17 +162,16 @@ int diff_dataset( hid_t file1_id, case H5T_COMPOUND: case H5T_STRING: case H5T_ARRAY: - -#endif - - - case H5T_TIME: case H5T_BITFIELD: case H5T_OPAQUE: - - case H5T_REFERENCE: case H5T_ENUM: case H5T_VLEN: +#endif + + case H5T_TIME: + case H5T_REFERENCE: + + if (options->verbose ) { printf("Comparison not supported\n"); printf("<%s> is of class %s and <%s> is of class %s\n", @@ -194,7 +193,11 @@ int diff_dataset( hid_t file1_id, storage_size1=H5Dget_storage_size(dset1_id); storage_size2=H5Dget_storage_size(dset2_id); if (storage_size1<=0 && storage_size2<=0) + { + if (options->verbose) + printf("<%s> and <%s> are empty datasets\n", obj1_name, obj2_name); goto out; + } /*------------------------------------------------------------------------- @@ -327,6 +330,7 @@ int diff_dataset( hid_t file1_id, *------------------------------------------------------------------------- */ +#if 0 can1=diff_can(m_type1); can2=diff_can(m_type2); if ( (can1==0 || can2==0)) @@ -340,6 +344,7 @@ int diff_dataset( hid_t file1_id, } goto out; } +#endif /*------------------------------------------------------------------------- * check for different signed/unsigned types 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 - |