summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/h5diff/testfiles/h5diff_201.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_203.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_204.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_205.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_207.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_70.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_80.txt6
-rw-r--r--tools/h5diff/testfiles/h5diff_90.txt4
-rw-r--r--tools/lib/h5diff_dset.c7
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: </g2/dset1> or </g2/dset2> are empty datasets
+Not comparable: </g2/dset1> or </g2/dset2> 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: </g2/dset3> has rank 1, dimensions [6], max dimensions [6]
-</g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]
+and </g2/dset4> 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: </g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]
-</g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
+and </g2/dset5> 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: </g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
-</g2/dset6> has rank 2, dimensions [3x2], max dimensions [3x2]
+and </g2/dset6> has rank 2, dimensions [3x2], max dimensions [3x2]
Not comparable: </g2/dset5> has sign H5T_SGN_2 and </g2/dset6> 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: </g2/dset8> or </g2/dset9> are empty datasets
+Not comparable: </g2/dset8> or </g2/dset9> is an empty dataset
Not comparable: </g2/dset8> has 2 members </g2/dset9> 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: </dset> and </dset>
-Not comparable: </dset> or </dset> are empty datasets
+Not comparable: </dset> or </dset> is an empty dataset
attribute: <string of </dset>> and <string of </dset>>
size: [2] [2]
position string of </dset> string of </dset> 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: </g1/arrayd> and </g1/arrayd>
-Not comparable: </g1/arrayd> or </g1/arrayd> are empty datasets
+Not comparable: </g1/arrayd> or </g1/arrayd> is an empty dataset
0 differences found
dataset: </g1/bitfield> and </g1/bitfield>
size: [2] [2]
@@ -380,10 +380,10 @@ position enum enum difference
[ 0 ] RED GREEN
1 differences found
dataset: </g1/enum2D> and </g1/enum2D>
-Not comparable: </g1/enum2D> or </g1/enum2D> are empty datasets
+Not comparable: </g1/enum2D> or </g1/enum2D> is an empty dataset
0 differences found
dataset: </g1/enum3D> and </g1/enum3D>
-Not comparable: </g1/enum3D> or </g1/enum3D> are empty datasets
+Not comparable: </g1/enum3D> or </g1/enum3D> is an empty dataset
0 differences found
dataset: </g1/float> and </g1/float>
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: </g1/dset4> and </g1/dset4>
group : </g2> and </g2>
0 differences found
dataset: </g2/dset1> and </g2/dset1>
-Not comparable: </g2/dset1> or </g2/dset1> are empty datasets
+Not comparable: </g2/dset1> or </g2/dset1> is an empty dataset
0 differences found
dataset: </g2/dset2> and </g2/dset2>
0 differences found
@@ -47,7 +47,7 @@ dataset: </g2/dset7> and </g2/dset7>
dataset: </g2/dset8> and </g2/dset8>
0 differences found
dataset: </g2/dset9> and </g2/dset9>
-Not comparable: </g2/dset9> or </g2/dset9> are empty datasets
+Not comparable: </g2/dset9> or </g2/dset9> 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);
generated by cgit v0.12 at 2024-11-06 18:58:31 (GMT)