From c3252ef1f2ac06e12fe91e9e7e1591f22c4819f4 Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Thu, 30 Jun 2005 15:57:01 -0500 Subject: [svn-r11005] Purpose: bug fix Description: the numbers of differences was not printed for each object Solution: print it Platforms tested: linux solaris aix Misc. update: --- tools/h5diff/h5diff_common.c | 54 +++++++++++------------------ tools/lib/h5diff.c | 79 ++++++++++++++++++++++++++---------------- tools/testfiles/h5diff_11.txt | 3 -- tools/testfiles/h5diff_12.txt | 3 -- tools/testfiles/h5diff_13.txt | 3 -- tools/testfiles/h5diff_14.txt | 3 -- tools/testfiles/h5diff_15.txt | 3 -- tools/testfiles/h5diff_16.txt | 3 -- tools/testfiles/h5diff_17.txt | 7 ++-- tools/testfiles/h5diff_20.txt | 3 -- tools/testfiles/h5diff_21.txt | 3 -- tools/testfiles/h5diff_22.txt | 3 -- tools/testfiles/h5diff_23.txt | 3 -- tools/testfiles/h5diff_24.txt | 3 -- tools/testfiles/h5diff_25.txt | 4 --- tools/testfiles/h5diff_50.txt | 3 -- tools/testfiles/h5diff_51.txt | 3 -- tools/testfiles/h5diff_52.txt | 3 -- tools/testfiles/h5diff_53.txt | 3 -- tools/testfiles/h5diff_54.txt | 3 -- tools/testfiles/h5diff_55.txt | 3 -- tools/testfiles/h5diff_56.txt | 3 -- tools/testfiles/h5diff_57.txt | 4 +-- tools/testfiles/h5diff_607.txt | 3 -- tools/testfiles/h5diff_608.txt | 3 -- tools/testfiles/h5diff_609.txt | 4 --- tools/testfiles/h5diff_610.txt | 3 -- tools/testfiles/h5diff_616.txt | 3 -- tools/testfiles/h5diff_617.txt | 3 -- tools/testfiles/h5diff_618.txt | 4 --- tools/testfiles/h5diff_619.txt | 3 -- tools/testfiles/h5diff_625.txt | 3 -- tools/testfiles/h5diff_626.txt | 3 -- tools/testfiles/h5diff_627.txt | 3 -- tools/testfiles/h5diff_628.txt | 3 -- tools/testfiles/h5diff_629.txt | 3 -- tools/testfiles/h5diff_70.txt | 6 ++-- tools/testfiles/h5diff_80.txt | 36 +++++++++++++++++-- 38 files changed, 111 insertions(+), 174 deletions(-) diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index 5387f2a..51ba881 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -175,43 +175,31 @@ void parse_input(int argc, const char* argv[], const char** fname1, const char** /*------------------------------------------------------------------------- * Function: print_results * - * Purpose: print how many differences were found, if files were comparable or not + * Purpose: print several information messages * *------------------------------------------------------------------------- */ -void print_results(hsize_t nfound, diff_opt_t* options) -{ - /*------------------------------------------------------------------------- - * print how many differences were found - *------------------------------------------------------------------------- - */ - if (!options->m_quiet) - { - printf("----------------------------------------------------\n"); - printf("Summary\n"); - printf("----------------------------------------------------\n"); - if (options->cmn_objs==0 && !options->err_stat) - { - printf("No common objects found. Files are not comparable.\n"); - if (!options->m_verbose) - printf("Use -v for a list of objects.\n"); - } - else - { - /* no errors found */ - if (!options->err_stat) - { - /* objects were not compared */ - if (options->not_cmp==1) - printf("Some objects are not comparable\n"); - else - /* objects were compared, print the number of differences */ - print_found(nfound); - } - } - } -} + void print_results(hsize_t nfound, diff_opt_t* options) + { + if (options->m_quiet || options->err_stat) + return; + + if (options->cmn_objs==0) + { + printf("No common objects found. Files are not comparable.\n"); + if (!options->m_verbose) + printf("Use -v for a list of objects.\n"); + } + + if (options->not_cmp==1) + { + printf("Some objects are not comparable\n"); + if (!options->m_verbose) + printf("Use -v for a list of objects.\n"); + } + + } /*------------------------------------------------------------------------- * Function: check_n_input diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 16e5af7..1529730 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -855,41 +855,54 @@ diff (hid_t file1_id, * H5G_DATASET *------------------------------------------------------------------------- */ - case H5G_DATASET: + case H5G_DATASET: - /* always print name */ + /*------------------------------------------------------------------------- + * verbose, always print name + *------------------------------------------------------------------------- + */ if (options->m_verbose) { - if (print_objname (options, (hsize_t)1)) - parallel_print("Dataset: <%s> and <%s>\n", path1, path2); - nfound = diff_dataset (file1_id, file2_id, path1, path2, options); - + if (print_objname (options, (hsize_t)1)) + parallel_print("Dataset: <%s> and <%s>\n", path1, path2); + nfound = diff_dataset (file1_id, file2_id, path1, path2, options); + /* always print the number of differences found */ + print_found(nfound); } - /* check first if we have differences */ + /*------------------------------------------------------------------------- + * non verbose, 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 (options->m_quiet == 0) { - if (print_objname (options, nfound)) - parallel_print("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 */ + /* 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)) + parallel_print("Dataset: <%s> and <%s>\n", path1, path2); + nfound = diff_dataset (file1_id, file2_id, path1, path2, options); + /* print the number of differences found only when found + this is valid for the default mode and report mode */ + print_found(nfound); + } /*if nfound */ + } /*if quiet */ + /*------------------------------------------------------------------------- + * quiet mode, just count differences + *------------------------------------------------------------------------- + */ + else + { + nfound = diff_dataset (file1_id, file2_id, path1, path2, options); + } + } /*else verbose */ + break; /*------------------------------------------------------------------------- @@ -909,7 +922,11 @@ diff (hid_t file1_id, nfound = (ret > 0) ? 0 : 1; if (print_objname (options, nfound)) - parallel_print("Datatype: <%s> and <%s>\n", path1, path2); + parallel_print("Datatype: <%s> and <%s>\n", path1, path2); + + /* always print the number of differences found in verbose mode */ + if (options->m_verbose) + print_found(nfound); /*------------------------------------------------------------------------- * compare attributes @@ -942,7 +959,11 @@ diff (hid_t file1_id, nfound = (ret != 0) ? 1 : 0; if (print_objname (options, nfound)) - parallel_print("Group: <%s> and <%s>\n", path1, path2); + parallel_print("Group: <%s> and <%s>\n", path1, path2); + + /* always print the number of differences found in verbose mode */ + if (options->m_verbose) + print_found(nfound); /*------------------------------------------------------------------------- * compare attributes diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt index 8500115..056e486 100644 --- a/tools/testfiles/h5diff_11.txt +++ b/tools/testfiles/h5diff_11.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt index 63ac461..d4605b2 100644 --- a/tools/testfiles/h5diff_12.txt +++ b/tools/testfiles/h5diff_12.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 g1/dset1 g1/dset2' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index ebe991b..53f44c1 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -8,7 +8,4 @@ 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 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index 53388ac..15e4dee 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -8,7 +8,4 @@ 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 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index 295bdb3..47789c4 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -10,7 +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 ----------------------------------------------------- -Summary ----------------------------------------------------- 6 differences found diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt index b8a78d6..5bff6fb 100644 --- a/tools/testfiles/h5diff_16.txt +++ b/tools/testfiles/h5diff_16.txt @@ -10,7 +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 ----------------------------------------------------- -Summary ----------------------------------------------------- 6 differences found diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index ca7c491..062bff5 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -12,6 +12,7 @@ file1 file2 x /g2 Group: and +0 differences found Dataset: and position dset1 dset1 difference ------------------------------------------------------------ @@ -19,8 +20,6 @@ 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 -Group: and ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found +Group: and +0 differences found diff --git a/tools/testfiles/h5diff_20.txt b/tools/testfiles/h5diff_20.txt index 086a847..280d689 100644 --- a/tools/testfiles/h5diff_20.txt +++ b/tools/testfiles/h5diff_20.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file3.h5 file3.h5 -v dset group' ############################# Comparison not possible: is of type H5G_DATASET and is of type H5G_GROUP ----------------------------------------------------- -Summary ----------------------------------------------------- Some objects are not comparable diff --git a/tools/testfiles/h5diff_21.txt b/tools/testfiles/h5diff_21.txt index bc79754..ba80257 100644 --- a/tools/testfiles/h5diff_21.txt +++ b/tools/testfiles/h5diff_21.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file3.h5 file3.h5 -v dset link' ############################# Comparison not possible: is of type H5G_DATASET and is of type H5G_LINK ----------------------------------------------------- -Summary ----------------------------------------------------- Some objects are not comparable diff --git a/tools/testfiles/h5diff_22.txt b/tools/testfiles/h5diff_22.txt index 57123fb..a32cf21 100644 --- a/tools/testfiles/h5diff_22.txt +++ b/tools/testfiles/h5diff_22.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file3.h5 file3.h5 -v dset type' ############################# Comparison not possible: is of type H5G_DATASET and is of type H5G_TYPE ----------------------------------------------------- -Summary ----------------------------------------------------- Some objects are not comparable diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt index e0801b0..d709dc6 100644 --- a/tools/testfiles/h5diff_23.txt +++ b/tools/testfiles/h5diff_23.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file3.h5 file3.h5 -v group group' ############################# Group: and ----------------------------------------------------- -Summary ----------------------------------------------------- 0 differences found diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt index 13acf40..467038a 100644 --- a/tools/testfiles/h5diff_24.txt +++ b/tools/testfiles/h5diff_24.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file3.h5 file3.h5 -v type type' ############################# Datatype: and ----------------------------------------------------- -Summary ----------------------------------------------------- 0 differences found diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt index 15d8583..b137f44 100644 --- a/tools/testfiles/h5diff_25.txt +++ b/tools/testfiles/h5diff_25.txt @@ -2,7 +2,3 @@ Expected output for 'h5diff file3.h5 file3.h5 -v link link' ############################# Link: and ----------------------------------------------------- -Summary ----------------------------------------------------- -0 differences found diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index 9703403..0827f0d 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -14,7 +14,4 @@ position dset0a dset0b difference [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index 11869b2..d63f7da 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -8,7 +8,4 @@ position dset1a dset1b difference [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index 81ad53e..2742164 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -8,7 +8,4 @@ position dset2a dset2b difference [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index da6aef6..814ae9a 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -8,7 +8,4 @@ position dset3a dset4b difference [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index 33d7dde..65074cf 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -8,7 +8,4 @@ position dset4a dset4b difference [ 1 1 ] 1 4 3 [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index dedf59d..ba97356 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -8,7 +8,4 @@ position dset5a dset5b difference [ 1 1 ] 1.000000 4.000000 3.000000 [ 2 0 ] 1.000000 5.000000 4.000000 [ 2 1 ] 1.000000 6.000000 5.000000 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index acc318c..1a00da1 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -8,7 +8,4 @@ position dset6a dset6b difference [ 1 1 ] 1.000000 4.000000 3.000000 [ 2 0 ] 1.000000 5.000000 4.000000 [ 2 1 ] 1.000000 6.000000 5.000000 ----------------------------------------------------- -Summary ----------------------------------------------------- 4 differences found diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt index 3917aad..b391530 100644 --- a/tools/testfiles/h5diff_57.txt +++ b/tools/testfiles/h5diff_57.txt @@ -9,7 +9,5 @@ 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 ----------------------------------------------------- -Summary ----------------------------------------------------- +0 differences found Some objects are not comparable diff --git a/tools/testfiles/h5diff_607.txt b/tools/testfiles/h5diff_607.txt index 24550f0..fa296f7 100644 --- a/tools/testfiles/h5diff_607.txt +++ b/tools/testfiles/h5diff_607.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 6 differences found diff --git a/tools/testfiles/h5diff_608.txt b/tools/testfiles/h5diff_608.txt index f0eaea5..073322f 100644 --- a/tools/testfiles/h5diff_608.txt +++ b/tools/testfiles/h5diff_608.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -d 1 -d 2 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 6 differences found diff --git a/tools/testfiles/h5diff_609.txt b/tools/testfiles/h5diff_609.txt index 378615e..279122f 100644 --- a/tools/testfiles/h5diff_609.txt +++ b/tools/testfiles/h5diff_609.txt @@ -1,7 +1,3 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d 200 g1/dset3 g1/dset4' ############################# ----------------------------------------------------- -Summary ----------------------------------------------------- -0 differences found diff --git a/tools/testfiles/h5diff_610.txt b/tools/testfiles/h5diff_610.txt index 24550f0..fa296f7 100644 --- a/tools/testfiles/h5diff_610.txt +++ b/tools/testfiles/h5diff_610.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 6 differences found diff --git a/tools/testfiles/h5diff_616.txt b/tools/testfiles/h5diff_616.txt index ccd8d48..0f71910 100644 --- a/tools/testfiles/h5diff_616.txt +++ b/tools/testfiles/h5diff_616.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -p 0.21 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 2 differences found diff --git a/tools/testfiles/h5diff_617.txt b/tools/testfiles/h5diff_617.txt index 4ce6c4a..ef74c72 100644 --- a/tools/testfiles/h5diff_617.txt +++ b/tools/testfiles/h5diff_617.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 2 differences found diff --git a/tools/testfiles/h5diff_618.txt b/tools/testfiles/h5diff_618.txt index 5f8ba8a..78d3ca2 100644 --- a/tools/testfiles/h5diff_618.txt +++ b/tools/testfiles/h5diff_618.txt @@ -1,7 +1,3 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4' ############################# ----------------------------------------------------- -Summary ----------------------------------------------------- -0 differences found diff --git a/tools/testfiles/h5diff_619.txt b/tools/testfiles/h5diff_619.txt index ea877cd..18d1efb 100644 --- a/tools/testfiles/h5diff_619.txt +++ b/tools/testfiles/h5diff_619.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 6 differences found diff --git a/tools/testfiles/h5diff_625.txt b/tools/testfiles/h5diff_625.txt index ab4d206..74477c8 100644 --- a/tools/testfiles/h5diff_625.txt +++ b/tools/testfiles/h5diff_625.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -n 2 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 2 differences found diff --git a/tools/testfiles/h5diff_626.txt b/tools/testfiles/h5diff_626.txt index 19d7089..85eb7dc 100644 --- a/tools/testfiles/h5diff_626.txt +++ b/tools/testfiles/h5diff_626.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 3 differences found diff --git a/tools/testfiles/h5diff_627.txt b/tools/testfiles/h5diff_627.txt index 22c2a78..999bbc3 100644 --- a/tools/testfiles/h5diff_627.txt +++ b/tools/testfiles/h5diff_627.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 6 differences found diff --git a/tools/testfiles/h5diff_628.txt b/tools/testfiles/h5diff_628.txt index 8e47534..604df64 100644 --- a/tools/testfiles/h5diff_628.txt +++ b/tools/testfiles/h5diff_628.txt @@ -2,7 +2,4 @@ Expected output for 'h5diff file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4' ############################# Dataset: and ----------------------------------------------------- -Summary ----------------------------------------------------- 1 differences found diff --git a/tools/testfiles/h5diff_629.txt b/tools/testfiles/h5diff_629.txt index db546ae..9f7632f 100644 --- a/tools/testfiles/h5diff_629.txt +++ b/tools/testfiles/h5diff_629.txt @@ -2,6 +2,3 @@ Expected output for 'h5diff file1.h6 file2.h6' ############################# h5diff: : unable to open file ----------------------------------------------------- -Summary ----------------------------------------------------- diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index 5d154ed..99aed5e 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -9,7 +9,9 @@ file1 file2 Dataset: and and are empty datasets +0 differences found Group: and +0 differences found Attribute: > and > position string of string of difference ------------------------------------------------------------ @@ -575,6 +577,7 @@ position float3D of float3D of difference [ 3 2 1 ] 24.000000 0.000000 24.000000 24 differences found Group: and +0 differences found Attribute: > and > position string of string of difference ------------------------------------------------------------ @@ -1139,7 +1142,4 @@ position float3D of float3D of difference [ 3 2 0 ] 23.000000 0.000000 23.000000 [ 3 2 1 ] 24.000000 0.000000 24.000000 24 differences found ----------------------------------------------------- -Summary ----------------------------------------------------- Some objects are not comparable diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index 5929c44..b2142e8 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -42,7 +42,9 @@ position dset dset difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +2 differences found Group: and +0 differences found Dataset: and position array array difference ------------------------------------------------------------ @@ -52,6 +54,7 @@ position array array difference [ 1 ] 4 0 4 [ 1 ] 5 0 5 [ 1 ] 6 0 6 +6 differences found Dataset: and position array2D array2D difference ------------------------------------------------------------ @@ -73,6 +76,7 @@ position array2D array2D difference [ 2 1 ] 16 0 16 [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 +18 differences found Dataset: and position array3D array3D difference ------------------------------------------------------------ @@ -148,11 +152,13 @@ position array3D array3D difference [ 3 2 1 ] 70 0 70 [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 +72 differences found Dataset: and position bitfield bitfield difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +2 differences found Dataset: and position bitfield2D bitfield2D difference ------------------------------------------------------------ @@ -162,6 +168,7 @@ position bitfield2D bitfield2D difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +6 differences found Dataset: and position bitfield3D bitfield3D difference ------------------------------------------------------------ @@ -189,6 +196,7 @@ position bitfield3D bitfield3D difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +24 differences found Dataset: and position compound compound difference ------------------------------------------------------------ @@ -196,6 +204,7 @@ position compound compound difference [ 0 ] 2.000000 0.000000 2.000000 [ 1 ] 3 0 3 [ 1 ] 4.000000 0.000000 4.000000 +4 differences found Dataset: and position compound2D compound2D difference ------------------------------------------------------------ @@ -211,6 +220,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 +12 differences found Dataset: and position compound3D compound3D difference ------------------------------------------------------------ @@ -262,19 +272,24 @@ 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 +48 differences found Dataset: and position enum enum difference ------------------------------------------------------------ [ 0 ] RED GREEN +1 differences found Dataset: and and are empty datasets +0 differences found Dataset: and and are empty datasets +0 differences found Dataset: and position float float difference ------------------------------------------------------------ [ 0 ] 1.000000 0.000000 1.000000 [ 1 ] 2.000000 0.000000 2.000000 +2 differences found Dataset: and position float2D float2D difference ------------------------------------------------------------ @@ -284,6 +299,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 +6 differences found Dataset: and position float3D float3D difference ------------------------------------------------------------ @@ -311,11 +327,13 @@ 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 +24 differences found Dataset: and position integer integer difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +2 differences found Dataset: and position integer2D integer2D difference ------------------------------------------------------------ @@ -325,6 +343,7 @@ position integer2D integer2D difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +6 differences found Dataset: and position integer3D integer3D difference ------------------------------------------------------------ @@ -352,11 +371,13 @@ position integer3D integer3D difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +24 differences found Dataset: and position opaque opaque difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +2 differences found Dataset: and position opaque2D opaque2D difference ------------------------------------------------------------ @@ -366,6 +387,7 @@ position opaque2D opaque2D difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +6 differences found Dataset: and position opaque3D opaque3D difference ------------------------------------------------------------ @@ -393,6 +415,7 @@ position opaque3D opaque3D difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +24 differences found Dataset: and position difference ------------------------------------------------------------ @@ -402,6 +425,7 @@ position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +4 differences found Dataset: and position difference ------------------------------------------------------------ @@ -427,6 +451,7 @@ position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +12 differences found Dataset: and position difference ------------------------------------------------------------ @@ -524,6 +549,7 @@ position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +48 differences found Dataset: and position string string difference ------------------------------------------------------------ @@ -531,6 +557,7 @@ position string string difference [ 0 ] b z [ 1 ] d z [ 1 ] e z +4 differences found Dataset: and position string2D string2D difference ------------------------------------------------------------ @@ -546,6 +573,7 @@ position string2D string2D difference [ 2 0 ] j z [ 2 1 ] k z [ 2 1 ] l z +12 differences found Dataset: and position string3D string3D difference ------------------------------------------------------------ @@ -596,12 +624,14 @@ position string3D string3D difference [ 3 2 0 ] W z [ 3 2 1 ] X z [ 3 2 1 ] Z z +47 differences found Dataset: and position vlen vlen difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 +3 differences found Dataset: and position vlen2D vlen2D difference ------------------------------------------------------------ @@ -616,6 +646,7 @@ position vlen2D vlen2D difference [ 2 1 ] 9 0 9 [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 +11 differences found Dataset: and position vlen3D vlen3D difference ------------------------------------------------------------ @@ -678,8 +709,7 @@ position vlen3D vlen3D difference [ 3 2 1 ] 57 0 57 [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 +59 differences found Group: and ----------------------------------------------------- -Summary ----------------------------------------------------- +0 differences found Some objects are not comparable -- cgit v0.12