From 358f18543f999e4ffbe85b04789f0ac9b35d808c Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Thu, 28 May 2009 16:31:57 -0500 Subject: [svn-r16991] change messages of -c option tested: windows, linux --- tools/h5diff/testfiles/h5diff_201.txt | 2 +- tools/h5diff/testfiles/h5diff_203.txt | 2 +- tools/h5diff/testfiles/h5diff_204.txt | 2 +- tools/h5diff/testfiles/h5diff_205.txt | 2 +- tools/h5diff/testfiles/h5diff_207.txt | 2 +- tools/h5diff/testfiles/h5diff_70.txt | 2 +- tools/h5diff/testfiles/h5diff_80.txt | 6 +++--- tools/h5diff/testfiles/h5diff_90.txt | 4 ++-- tools/lib/h5diff_dset.c | 7 ++++--- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tools/h5diff/testfiles/h5diff_201.txt b/tools/h5diff/testfiles/h5diff_201.txt index a212444..84d6766 100644 --- a/tools/h5diff/testfiles/h5diff_201.txt +++ b/tools/h5diff/testfiles/h5diff_201.txt @@ -1 +1 @@ -Not comparable: or are empty datasets +Not comparable: or is an empty dataset diff --git a/tools/h5diff/testfiles/h5diff_203.txt b/tools/h5diff/testfiles/h5diff_203.txt index 49ee21c..496523c 100644 --- a/tools/h5diff/testfiles/h5diff_203.txt +++ b/tools/h5diff/testfiles/h5diff_203.txt @@ -1,2 +1,2 @@ Not comparable: has rank 1, dimensions [6], max dimensions [6] - has rank 2, dimensions [3x2], max dimensions [3x2] +and has rank 2, dimensions [3x2], max dimensions [3x2] diff --git a/tools/h5diff/testfiles/h5diff_204.txt b/tools/h5diff/testfiles/h5diff_204.txt index 5a3d87f..098a203 100644 --- a/tools/h5diff/testfiles/h5diff_204.txt +++ b/tools/h5diff/testfiles/h5diff_204.txt @@ -1,2 +1,2 @@ Not comparable: has rank 2, dimensions [3x2], max dimensions [3x2] - has rank 2, dimensions [2x2], max dimensions [2x2] +and has rank 2, dimensions [2x2], max dimensions [2x2] diff --git a/tools/h5diff/testfiles/h5diff_205.txt b/tools/h5diff/testfiles/h5diff_205.txt index 81298af..3e2d1f2 100644 --- a/tools/h5diff/testfiles/h5diff_205.txt +++ b/tools/h5diff/testfiles/h5diff_205.txt @@ -1,3 +1,3 @@ Not comparable: has rank 2, dimensions [2x2], max dimensions [2x2] - has rank 2, dimensions [3x2], max dimensions [3x2] +and has rank 2, dimensions [3x2], max dimensions [3x2] Not comparable: has sign H5T_SGN_2 and has sign H5T_SGN_NONE diff --git a/tools/h5diff/testfiles/h5diff_207.txt b/tools/h5diff/testfiles/h5diff_207.txt index f8152f8..bb8e23f 100644 --- a/tools/h5diff/testfiles/h5diff_207.txt +++ b/tools/h5diff/testfiles/h5diff_207.txt @@ -1,2 +1,2 @@ -Not comparable: or are empty datasets +Not comparable: or is an empty dataset Not comparable: has 2 members has 1 members diff --git a/tools/h5diff/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt index b42cacd..30dbefe 100644 --- a/tools/h5diff/testfiles/h5diff_70.txt +++ b/tools/h5diff/testfiles/h5diff_70.txt @@ -677,7 +677,7 @@ position float3D of float3D of difference [ 3 2 1 ] 24 0 24 24 differences found dataset: and -Not comparable: or are empty datasets +Not comparable: or is an empty dataset attribute: > and > size: [2] [2] position string of string of difference diff --git a/tools/h5diff/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt index c8ec309..33090df 100644 --- a/tools/h5diff/testfiles/h5diff_80.txt +++ b/tools/h5diff/testfiles/h5diff_80.txt @@ -245,7 +245,7 @@ position array3D array3D difference [ 3 2 1 ] 72 0 72 72 differences found dataset: and -Not comparable: or are empty datasets +Not comparable: or is an empty dataset 0 differences found dataset: and size: [2] [2] @@ -380,10 +380,10 @@ position enum enum difference [ 0 ] RED GREEN 1 differences found dataset: and -Not comparable: or are empty datasets +Not comparable: or is an empty dataset 0 differences found dataset: and -Not comparable: or are empty datasets +Not comparable: or is an empty dataset 0 differences found dataset: and size: [2] [2] diff --git a/tools/h5diff/testfiles/h5diff_90.txt b/tools/h5diff/testfiles/h5diff_90.txt index a513ffa..e6bfa14 100644 --- a/tools/h5diff/testfiles/h5diff_90.txt +++ b/tools/h5diff/testfiles/h5diff_90.txt @@ -30,7 +30,7 @@ dataset: and group : and 0 differences found dataset: and -Not comparable: or are empty datasets +Not comparable: or is an empty dataset 0 differences found dataset: and 0 differences found @@ -47,7 +47,7 @@ dataset: and dataset: and 0 differences found dataset: and -Not comparable: or are empty datasets +Not comparable: or is an empty dataset 0 differences found -------------------------------- Some objects are not comparable diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index bbfa351..7f2a80a 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -267,7 +267,7 @@ hsize_t diff_datasetid( hid_t did1, if (storage_size1==0 || storage_size2==0) { if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name) - parallel_print("Not comparable: <%s> or <%s> are empty datasets\n", obj1_name, obj2_name); + parallel_print("Not comparable: <%s> or <%s> is an empty dataset\n", obj1_name, obj2_name); can_compare=0; options->not_cmp=1; } @@ -788,6 +788,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */ *------------------------------------------------------------------------- */ + if ( rank1 != rank2 ) { @@ -798,7 +799,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */ parallel_print(", max dimensions "); print_dimensions(rank1,maxdim1); parallel_print("\n" ); - parallel_print("<%s> has rank %d, dimensions ", obj2_name, rank2); + parallel_print("and <%s> has rank %d, dimensions ", obj2_name, rank2); print_dimensions(rank2,dims2); parallel_print(", max dimensions "); print_dimensions(rank2,maxdim2); @@ -843,7 +844,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */ parallel_print(", max dimensions "); print_dimensions(rank1,maxdim1); parallel_print("\n" ); - parallel_print("<%s> has rank %d, dimensions ", obj2_name, rank2); + parallel_print("and <%s> has rank %d, dimensions ", obj2_name, rank2); print_dimensions(rank2,dims2); parallel_print(", max dimensions "); print_dimensions(rank2,maxdim2); -- cgit v0.12