From 140dfae48a286c2f2a185594ceb49d4c61aa6465 Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Wed, 21 Jul 2004 12:50:49 -0500 Subject: [svn-r8912] Purpose: bug fixes Description: the return error code for a function was not initialized. in HP-UX it happened that this variable was initialized to -1 causing the function to return with an error condtion solution : initialized the variable to 0 the name of the dataset was printed after the differences in verbose mode and report when differences were found solution : check first if differences were found and then print the name of dataset and differences in verbose mode always print the name first Solution: Platforms tested: linux aix solaris Misc. update: --- tools/lib/h5diff.c | 34 ++++++++++++- tools/lib/h5diff_array.c | 9 ++-- tools/lib/h5diff_attr.c | 73 +++++++++++++++++++++++----- tools/testfiles/h5diff_13.txt | 2 +- tools/testfiles/h5diff_14.txt | 2 +- tools/testfiles/h5diff_15.txt | 2 +- tools/testfiles/h5diff_16.txt | 2 +- tools/testfiles/h5diff_17.txt | 2 +- tools/testfiles/h5diff_50.txt | 2 +- tools/testfiles/h5diff_51.txt | 2 +- tools/testfiles/h5diff_52.txt | 2 +- tools/testfiles/h5diff_53.txt | 2 +- tools/testfiles/h5diff_54.txt | 2 +- tools/testfiles/h5diff_55.txt | 2 +- tools/testfiles/h5diff_56.txt | 2 +- tools/testfiles/h5diff_57.txt | 2 +- tools/testfiles/h5diff_70.txt | 110 +++++++++++++++++++++--------------------- tools/testfiles/h5diff_80.txt | 62 ++++++++++++------------ 18 files changed, 198 insertions(+), 116 deletions(-) diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 818bc40..f5ba995 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -432,9 +432,39 @@ hsize_t diff( hid_t file1_id, *------------------------------------------------------------------------- */ case H5G_DATASET: - nfound=diff_dataset(file1_id,file2_id,path1,path2,options); - if (print_objname(options,nfound)) + + /* always print name */ + if (options->m_verbose) + { + if (print_objname(options,1)) printf( "Dataset: <%s> and <%s>\n",path1,path2); + nfound=diff_dataset(file1_id,file2_id,path1,path2,options); + + } + /* check first if we have differences */ + else + { + if (options->m_quiet==0) + { + /* shut up temporarily */ + options->m_quiet=1; + nfound=diff_dataset(file1_id,file2_id,path1,path2,options); + /* print again */ + options->m_quiet=0; + if (nfound) + { + if (print_objname(options,nfound)) + printf( "Dataset: <%s> and <%s>\n",path1,path2); + nfound=diff_dataset(file1_id,file2_id,path1,path2,options); + } /*if*/ + } /*if*/ + /* in quiet mode, just count differences */ + else + { + nfound=diff_dataset(file1_id,file2_id,path1,path2,options); + } + }/*else*/ + break; /*------------------------------------------------------------------------- diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 51d87d0..73a1fbf 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -24,12 +24,13 @@ static hbool_t is_zero(const void *_mem, size_t size); /*------------------------------------------------------------------------- * Function: print_data * - * Purpose: print data only in report or verbose modes + * Purpose: print data only in report or verbose modes, + * and do not print in quiet mode *------------------------------------------------------------------------- */ static int print_data(diff_opt_t *options) -{ - return (options->m_report || options->m_verbose==1)?1:0; +{ + return ( (options->m_report || options->m_verbose) && !options->m_quiet)?1:0; } /*------------------------------------------------------------------------- @@ -208,7 +209,7 @@ hsize_t diff_datum(void *_mem1, H5G_stat_t sb1; H5G_stat_t sb2; hsize_t nfound=0; /* differences found */ - int ret; + int ret=0; /* check return error */ /* Build default formats for long long types */ sprintf(fmt_llong, "%%%sd %%%sd %%%sd\n", diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index bf3a874..6aedaf5 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -189,7 +189,12 @@ int diff_attr(hid_t loc1_id, */ sprintf(name1,"%s of <%s>",name1,path1); sprintf(name2,"%s of <%s>",name2,path2); - nfound = diff_array(buf1, + + /* always print name */ + if (options->m_verbose) + { + printf( "Attribute: <%s> and <%s>\n",name1,name2); + nfound = diff_array(buf1, buf2, nelmts1, rank1, @@ -200,18 +205,64 @@ int diff_attr(hid_t loc1_id, mtype1_id, attr1_id, attr2_id); - - }/*cmp*/ - -/*------------------------------------------------------------------------- - * print how many differences were found - *------------------------------------------------------------------------- - */ - if (print_objname(options,nfound)) - { - printf( "Attribute: <%s> and <%s>\n",name1,name2); print_found(nfound); + } + /* check first if we have differences */ + else + { + if (options->m_quiet==0) + { + /* shut up temporarily */ + options->m_quiet=1; + nfound = diff_array(buf1, + buf2, + nelmts1, + rank1, + dims1, + options, + name1, + name2, + mtype1_id, + attr1_id, + attr2_id); + /* print again */ + options->m_quiet=0; + if (nfound) + { + printf( "Attribute: <%s> and <%s>\n",name1,name2); + nfound = diff_array(buf1, + buf2, + nelmts1, + rank1, + dims1, + options, + name1, + name2, + mtype1_id, + attr1_id, + attr2_id); + print_found(nfound); + } /*if*/ + } /*if*/ + /* in quiet mode, just count differences */ + else + { + nfound = diff_array(buf1, + buf2, + nelmts1, + rank1, + dims1, + options, + name1, + name2, + mtype1_id, + attr1_id, + attr2_id); + } /*else quiet */ + } /*else verbose */ + }/*cmp*/ + /*------------------------------------------------------------------------- diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index 8d5c69e..53f44c1 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -r' ############################# +Dataset: and position dset1 dset1 difference ------------------------------------------------------------ [ 0 1 ] 1.000000 1.100000 0.100000 [ 1 0 ] 1.000000 1.010000 0.010000 [ 1 1 ] 1.000000 1.001000 0.001000 [ 2 0 ] 1.000000 1.000100 0.000100 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index 33683d3..15e4dee 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -r g1/dset1 g1/dset2' ############################# +Dataset: and position dset1 dset2 difference ------------------------------------------------------------ [ 0 1 ] 1.000000 1.100000 0.100000 [ 1 0 ] 1.000000 1.010000 0.010000 [ 1 1 ] 1.000000 1.001000 0.001000 [ 2 0 ] 1.000000 1.000100 0.000100 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index e2aeb88..47789c4 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -1,6 +1,7 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -r -d 5 g1/dset3 g1/dset4' ############################# +Dataset: and position dset3 dset4 difference ------------------------------------------------------------ [ 0 0 ] 100.000000 110.000000 10.000000 @@ -9,5 +10,4 @@ position dset3 dset4 difference [ 1 1 ] 100.000000 80.000000 20.000000 [ 2 0 ] 100.000000 140.000000 40.000000 [ 2 1 ] 100.000000 200.000000 100.000000 -Dataset: and 6 differences found diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt index 1aa2f72..5bff6fb 100644 --- a/tools/testfiles/h5diff_16.txt +++ b/tools/testfiles/h5diff_16.txt @@ -1,6 +1,7 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -r -p 0.05 g1/dset3 g1/dset4' ############################# +Dataset: and position dset3 dset4 difference relative ------------------------------------------------------------------------ [ 0 0 ] 100 110 10 0.1 @@ -9,5 +10,4 @@ position dset3 dset4 difference relative [ 1 1 ] 100 80 20 0.2 [ 2 0 ] 100 140 40 0.4 [ 2 1 ] 100 200 100 1 -Dataset: and 6 differences found diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index 6f7a360..3ba4b74 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -12,12 +12,12 @@ file1 file2 x /g2 Group: and +Dataset: and position dset1 dset1 difference ------------------------------------------------------------ [ 0 1 ] 1.000000 1.100000 0.100000 [ 1 0 ] 1.000000 1.010000 0.010000 [ 1 1 ] 1.000000 1.001000 0.001000 [ 2 0 ] 1.000000 1.000100 0.000100 -Dataset: and Group: and 4 differences found diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index af07a2a..0827f0d 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -1,6 +1,7 @@ ############################# Expected output for 'h5diff file4.h5 file4.h5 -v dset0a dset0b' ############################# +Dataset: and Warning: Different storage datatype has file datatype H5T_STD_I16LE has file datatype H5T_STD_I32LE @@ -13,5 +14,4 @@ position dset0a dset0b difference [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index 216c921..d63f7da 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff file4.h5 file4.h5 -v dset1a dset1b' ############################# +Dataset: and position dset1a dset1b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index f1e824f..2742164 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff file4.h5 file4.h5 -v dset2a dset2b' ############################# +Dataset: and position dset2a dset2b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index 115985a..814ae9a 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff file4.h5 file4.h5 -v dset3a dset4b' ############################# +Dataset: and position dset3a dset4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index 42f3d38..65074cf 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff file4.h5 file4.h5 -v dset4a dset4b' ############################# +Dataset: and position dset4a dset4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index b52d080..ba97356 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff file4.h5 file4.h5 -v dset5a dset5b' ############################# +Dataset: and 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 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index 888aebb..1a00da1 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff file4.h5 file4.h5 -v dset6a dset6b' ############################# +Dataset: and 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 -Dataset: and 4 differences found diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt index 0502f82..b4424a5 100644 --- a/tools/testfiles/h5diff_57.txt +++ b/tools/testfiles/h5diff_57.txt @@ -1,6 +1,7 @@ ############################# Expected output for 'h5diff file4.h5 file4.h5 -v dset7a dset7b' ############################# +Dataset: and Warning: Different storage datatype has file datatype H5T_STD_I8LE has file datatype H5T_STD_U8LE @@ -8,5 +9,4 @@ Warning: Different storage datatype has file datatype H5T_STD_I8LE has file datatype H5T_STD_U8LE Comparison not supported: has sign H5T_SGN_2 and has sign H5T_SGN_NONE -Dataset: and 0 differences found diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index 0fc1e09..a44b4de 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -7,50 +7,51 @@ file1 file2 x x /dset x x /g1 - and are empty datasets Dataset: and + and are empty datasets Group: and +Attribute: > and > position string of string of difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z -Attribute: > and > 4 differences found +Attribute: > and > position bitfield of bitfield of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Attribute: > and > 2 differences found +Attribute: > and > position opaque of opaque of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Attribute: > and > 2 differences found +Attribute: > and > position compound of compound of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2.000000 0.000000 2.000000 [ 1 ] 3 0 3 [ 1 ] 4.000000 0.000000 4.000000 -Attribute: > and > 4 differences found +Attribute: > and > position enum of enum of difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN -Attribute: > and > 2 differences found +Attribute: > and > position vlen of vlen of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 -Attribute: > and > 3 differences found +Attribute: > and > position array of array of difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -59,20 +60,20 @@ position array of array of difference [ 1 ] 4 0 4 [ 1 ] 5 0 5 [ 1 ] 6 0 6 -Attribute: > and > 6 differences found +Attribute: > and > position integer of integer of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Attribute: > and > 2 differences found +Attribute: > and > position float of float of difference ------------------------------------------------------------ [ 0 ] 1.000000 0.000000 1.000000 [ 1 ] 2.000000 0.000000 2.000000 -Attribute: > and > 2 differences found +Attribute: > and > position string2D of string2D of difference ------------------------------------------------------------ [ 0 0 ] a z @@ -87,8 +88,8 @@ position string2D of string2D of difference [ 2 0 ] j z [ 2 1 ] k z [ 2 1 ] l z -Attribute: > and > 12 differences found +Attribute: > and > position bitfield2D of bitfield2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -97,8 +98,8 @@ position bitfield2D of bitfield2D of difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Attribute: > and > 6 differences found +Attribute: > and > position opaque2D of opaque2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -107,8 +108,8 @@ position opaque2D of opaque2D of difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Attribute: > and > 6 differences found +Attribute: > and > position compound2D of compound2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -123,8 +124,8 @@ position compound2D of compound2D of difference [ 2 0 ] 10.000000 0.000000 10.000000 [ 2 1 ] 11 0 11 [ 2 1 ] 12.000000 0.000000 12.000000 -Attribute: > and > 12 differences found +Attribute: > and > position enum2D of enum2D of difference ------------------------------------------------------------ [ 0 0 ] RED GREEN @@ -133,8 +134,8 @@ position enum2D of enum2D of difference [ 1 1 ] RED GREEN [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN -Attribute: > and > 6 differences found +Attribute: > and > position vlen2D of vlen2D of difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -148,8 +149,8 @@ position vlen2D of vlen2D of difference [ 2 1 ] 9 0 9 [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 -Attribute: > and > 11 differences found +Attribute: > and > position array2D of array2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -170,8 +171,8 @@ position array2D of array2D of difference [ 2 1 ] 16 0 16 [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 -Attribute: > and > 18 differences found +Attribute: > and > position integer2D of integer2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -180,8 +181,8 @@ position integer2D of integer2D of difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Attribute: > and > 6 differences found +Attribute: > and > position float2D of float2D of difference ------------------------------------------------------------ [ 0 0 ] 1.000000 0.000000 1.000000 @@ -190,8 +191,8 @@ position float2D of float2D of difference [ 1 1 ] 4.000000 0.000000 4.000000 [ 2 0 ] 5.000000 0.000000 5.000000 [ 2 1 ] 6.000000 0.000000 6.000000 -Attribute: > and > 6 differences found +Attribute: > and > position string3D of string3D of difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -241,8 +242,8 @@ position string3D of string3D of difference [ 3 2 0 ] W z [ 3 2 1 ] X z [ 3 2 1 ] Z z -Attribute: > and > 47 differences found +Attribute: > and > position bitfield3D of bitfield3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -269,8 +270,8 @@ position bitfield3D of bitfield3D of difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Attribute: > and > 24 differences found +Attribute: > and > position opaque3D of opaque3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -297,8 +298,8 @@ position opaque3D of opaque3D of difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Attribute: > and > 24 differences found +Attribute: > and > position compound3D of compound3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -349,8 +350,8 @@ position compound3D of compound3D of difference [ 3 2 0 ] 46.000000 0.000000 46.000000 [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48.000000 0.000000 48.000000 -Attribute: > and > 48 differences found +Attribute: > and > position enum3D of enum3D of difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED @@ -377,8 +378,8 @@ position enum3D of enum3D of difference [ 3 1 1 ] GREEN RED [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED -Attribute: > and > 24 differences found +Attribute: > and > position vlen3D of vlen3D of difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -440,8 +441,8 @@ position vlen3D of vlen3D of difference [ 3 2 1 ] 57 0 57 [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 -Attribute: > and > 59 differences found +Attribute: > and > position array3D of array3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -516,8 +517,8 @@ position array3D of array3D of difference [ 3 2 1 ] 70 0 70 [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 -Attribute: > and > 72 differences found +Attribute: > and > position integer3D of integer3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -544,8 +545,8 @@ position integer3D of integer3D of difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Attribute: > and > 24 differences found +Attribute: > and > position float3D of float3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1.000000 0.000000 1.000000 @@ -572,50 +573,50 @@ position float3D of float3D of difference [ 3 1 1 ] 22.000000 0.000000 22.000000 [ 3 2 0 ] 23.000000 0.000000 23.000000 [ 3 2 1 ] 24.000000 0.000000 24.000000 -Attribute: > and > 24 differences found Group: and +Attribute: > and > position string of string of difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z -Attribute: > and > 4 differences found +Attribute: > and > position bitfield of bitfield of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Attribute: > and > 2 differences found +Attribute: > and > position opaque of opaque of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Attribute: > and > 2 differences found +Attribute: > and > position compound of compound of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2.000000 0.000000 2.000000 [ 1 ] 3 0 3 [ 1 ] 4.000000 0.000000 4.000000 -Attribute: > and > 4 differences found +Attribute: > and > position enum of enum of difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN -Attribute: > and > 2 differences found +Attribute: > and > position vlen of vlen of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 -Attribute: > and > 3 differences found +Attribute: > and > position array of array of difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -624,20 +625,20 @@ position array of array of difference [ 1 ] 4 0 4 [ 1 ] 5 0 5 [ 1 ] 6 0 6 -Attribute: > and > 6 differences found +Attribute: > and > position integer of integer of difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Attribute: > and > 2 differences found +Attribute: > and > position float of float of difference ------------------------------------------------------------ [ 0 ] 1.000000 0.000000 1.000000 [ 1 ] 2.000000 0.000000 2.000000 -Attribute: > and > 2 differences found +Attribute: > and > position string2D of string2D of difference ------------------------------------------------------------ [ 0 0 ] a z @@ -652,8 +653,8 @@ position string2D of string2D of difference [ 2 0 ] j z [ 2 1 ] k z [ 2 1 ] l z -Attribute: > and > 12 differences found +Attribute: > and > position bitfield2D of bitfield2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -662,8 +663,8 @@ position bitfield2D of bitfield2D of difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Attribute: > and > 6 differences found +Attribute: > and > position opaque2D of opaque2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -672,8 +673,8 @@ position opaque2D of opaque2D of difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Attribute: > and > 6 differences found +Attribute: > and > position compound2D of compound2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -688,8 +689,8 @@ position compound2D of compound2D of difference [ 2 0 ] 10.000000 0.000000 10.000000 [ 2 1 ] 11 0 11 [ 2 1 ] 12.000000 0.000000 12.000000 -Attribute: > and > 12 differences found +Attribute: > and > position enum2D of enum2D of difference ------------------------------------------------------------ [ 0 0 ] RED GREEN @@ -698,8 +699,8 @@ position enum2D of enum2D of difference [ 1 1 ] RED GREEN [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN -Attribute: > and > 6 differences found +Attribute: > and > position vlen2D of vlen2D of difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -713,8 +714,8 @@ position vlen2D of vlen2D of difference [ 2 1 ] 9 0 9 [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 -Attribute: > and > 11 differences found +Attribute: > and > position array2D of array2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -735,8 +736,8 @@ position array2D of array2D of difference [ 2 1 ] 16 0 16 [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 -Attribute: > and > 18 differences found +Attribute: > and > position integer2D of integer2D of difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -745,8 +746,8 @@ position integer2D of integer2D of difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Attribute: > and > 6 differences found +Attribute: > and > position float2D of float2D of difference ------------------------------------------------------------ [ 0 0 ] 1.000000 0.000000 1.000000 @@ -755,8 +756,8 @@ position float2D of float2D of difference [ 1 1 ] 4.000000 0.000000 4.000000 [ 2 0 ] 5.000000 0.000000 5.000000 [ 2 1 ] 6.000000 0.000000 6.000000 -Attribute: > and > 6 differences found +Attribute: > and > position string3D of string3D of difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -806,8 +807,8 @@ position string3D of string3D of difference [ 3 2 0 ] W z [ 3 2 1 ] X z [ 3 2 1 ] Z z -Attribute: > and > 47 differences found +Attribute: > and > position bitfield3D of bitfield3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -834,8 +835,8 @@ position bitfield3D of bitfield3D of difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Attribute: > and > 24 differences found +Attribute: > and > position opaque3D of opaque3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -862,8 +863,8 @@ position opaque3D of opaque3D of difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Attribute: > and > 24 differences found +Attribute: > and > position compound3D of compound3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -914,8 +915,8 @@ position compound3D of compound3D of difference [ 3 2 0 ] 46.000000 0.000000 46.000000 [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48.000000 0.000000 48.000000 -Attribute: > and > 48 differences found +Attribute: > and > position enum3D of enum3D of difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED @@ -942,8 +943,8 @@ position enum3D of enum3D of difference [ 3 1 1 ] GREEN RED [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED -Attribute: > and > 24 differences found +Attribute: > and > position vlen3D of vlen3D of difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -1005,8 +1006,8 @@ position vlen3D of vlen3D of difference [ 3 2 1 ] 57 0 57 [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 -Attribute: > and > 59 differences found +Attribute: > and > position array3D of array3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -1081,8 +1082,8 @@ position array3D of array3D of difference [ 3 2 1 ] 70 0 70 [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 -Attribute: > and > 72 differences found +Attribute: > and > position integer3D of integer3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -1109,8 +1110,8 @@ position integer3D of integer3D of difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Attribute: > and > 24 differences found +Attribute: > and > position float3D of float3D of difference ------------------------------------------------------------ [ 0 0 0 ] 1.000000 0.000000 1.000000 @@ -1137,6 +1138,5 @@ position float3D of float3D of difference [ 3 1 1 ] 22.000000 0.000000 22.000000 [ 3 2 0 ] 23.000000 0.000000 23.000000 [ 3 2 1 ] 24.000000 0.000000 24.000000 -Attribute: > and > 24 differences found 0 differences found diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index 420b2dc..8f7adca 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -37,12 +37,13 @@ file1 file2 x x /g1/vlen2D x x /g1/vlen3D +Dataset: and position dset dset difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Dataset: and Group: and +Dataset: and position array array difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -51,7 +52,7 @@ position array array difference [ 1 ] 4 0 4 [ 1 ] 5 0 5 [ 1 ] 6 0 6 -Dataset: and +Dataset: and position array2D array2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -72,7 +73,7 @@ position array2D array2D difference [ 2 1 ] 16 0 16 [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 -Dataset: and +Dataset: and position array3D array3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -147,12 +148,12 @@ position array3D array3D difference [ 3 2 1 ] 70 0 70 [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 -Dataset: and +Dataset: and position bitfield bitfield difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Dataset: and +Dataset: and position bitfield2D bitfield2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -161,7 +162,7 @@ position bitfield2D bitfield2D difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Dataset: and +Dataset: and position bitfield3D bitfield3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -188,14 +189,14 @@ position bitfield3D bitfield3D difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Dataset: and +Dataset: and position compound compound difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2.000000 0.000000 2.000000 [ 1 ] 3 0 3 [ 1 ] 4.000000 0.000000 4.000000 -Dataset: and +Dataset: and position compound2D compound2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -210,7 +211,7 @@ position compound2D compound2D difference [ 2 0 ] 10.000000 0.000000 10.000000 [ 2 1 ] 11 0 11 [ 2 1 ] 12.000000 0.000000 12.000000 -Dataset: and +Dataset: and position compound3D compound3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -261,20 +262,20 @@ position compound3D compound3D difference [ 3 2 0 ] 46.000000 0.000000 46.000000 [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48.000000 0.000000 48.000000 -Dataset: and +Dataset: and position enum enum difference ------------------------------------------------------------ [ 0 ] RED GREEN -Dataset: and - and are empty datasets Dataset: and - and are empty datasets + and are empty datasets Dataset: and + and are empty datasets +Dataset: and position float float difference ------------------------------------------------------------ [ 0 ] 1.000000 0.000000 1.000000 [ 1 ] 2.000000 0.000000 2.000000 -Dataset: and +Dataset: and position float2D float2D difference ------------------------------------------------------------ [ 0 0 ] 1.000000 0.000000 1.000000 @@ -283,7 +284,7 @@ position float2D float2D difference [ 1 1 ] 4.000000 0.000000 4.000000 [ 2 0 ] 5.000000 0.000000 5.000000 [ 2 1 ] 6.000000 0.000000 6.000000 -Dataset: and +Dataset: and position float3D float3D difference ------------------------------------------------------------ [ 0 0 0 ] 1.000000 0.000000 1.000000 @@ -310,12 +311,12 @@ position float3D float3D difference [ 3 1 1 ] 22.000000 0.000000 22.000000 [ 3 2 0 ] 23.000000 0.000000 23.000000 [ 3 2 1 ] 24.000000 0.000000 24.000000 -Dataset: and +Dataset: and position integer integer difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Dataset: and +Dataset: and position integer2D integer2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -324,7 +325,7 @@ position integer2D integer2D difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Dataset: and +Dataset: and position integer3D integer3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -351,12 +352,12 @@ position integer3D integer3D difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Dataset: and +Dataset: and position opaque opaque difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Dataset: and +Dataset: and position opaque2D opaque2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -365,7 +366,7 @@ position opaque2D opaque2D difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 -Dataset: and +Dataset: and position opaque3D opaque3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -392,7 +393,7 @@ position opaque3D opaque3D difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 -Dataset: and +Dataset: and position difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -401,7 +402,7 @@ position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Dataset: and +Dataset: and position difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -426,7 +427,7 @@ position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Dataset: and +Dataset: and position difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -523,14 +524,14 @@ position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 -Dataset: and +Dataset: and position string string difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z -Dataset: and +Dataset: and position string2D string2D difference ------------------------------------------------------------ [ 0 0 ] a z @@ -545,7 +546,7 @@ position string2D string2D difference [ 2 0 ] j z [ 2 1 ] k z [ 2 1 ] l z -Dataset: and +Dataset: and position string3D string3D difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -595,13 +596,13 @@ position string3D string3D difference [ 3 2 0 ] W z [ 3 2 1 ] X z [ 3 2 1 ] Z z -Dataset: and +Dataset: and position vlen vlen difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 -Dataset: and +Dataset: and position vlen2D vlen2D difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -615,7 +616,7 @@ position vlen2D vlen2D difference [ 2 1 ] 9 0 9 [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 -Dataset: and +Dataset: and position vlen3D vlen3D difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -677,6 +678,5 @@ position vlen3D vlen3D difference [ 3 2 1 ] 57 0 57 [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 -Dataset: and Group: and 491 differences found -- cgit v0.12