summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/h5diff/testfiles/h5diff_201.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_202.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.txt4
-rw-r--r--tools/h5diff/testfiles/h5diff_206.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_207.txt4
-rw-r--r--tools/h5diff/testfiles/h5diff_57.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.c14
12 files changed, 23 insertions, 23 deletions
diff --git a/tools/h5diff/testfiles/h5diff_201.txt b/tools/h5diff/testfiles/h5diff_201.txt
index 599cc2b..a212444 100644
--- a/tools/h5diff/testfiles/h5diff_201.txt
+++ b/tools/h5diff/testfiles/h5diff_201.txt
@@ -1 +1 @@
-</g2/dset1> or </g2/dset2> are empty datasets
+Not comparable: </g2/dset1> or </g2/dset2> are empty datasets
diff --git a/tools/h5diff/testfiles/h5diff_202.txt b/tools/h5diff/testfiles/h5diff_202.txt
index a881cf5..ee240c2 100644
--- a/tools/h5diff/testfiles/h5diff_202.txt
+++ b/tools/h5diff/testfiles/h5diff_202.txt
@@ -1,2 +1,2 @@
</g2/dset2> is of class H5T_FLOAT and </g2/dset3> is of class H5T_INTEGER
-</g2/dset2> has sign H5T_SGN_ERROR and </g2/dset3> has sign H5T_SGN_2
+Not comparable: </g2/dset2> has sign H5T_SGN_ERROR and </g2/dset3> has sign H5T_SGN_2
diff --git a/tools/h5diff/testfiles/h5diff_203.txt b/tools/h5diff/testfiles/h5diff_203.txt
index aea1891..49ee21c 100644
--- a/tools/h5diff/testfiles/h5diff_203.txt
+++ b/tools/h5diff/testfiles/h5diff_203.txt
@@ -1,2 +1,2 @@
-</g2/dset3> has rank 1, dimensions [6], max dimensions [6]
+Not comparable: </g2/dset3> has rank 1, dimensions [6], max dimensions [6]
</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 66b9e63..5a3d87f 100644
--- a/tools/h5diff/testfiles/h5diff_204.txt
+++ b/tools/h5diff/testfiles/h5diff_204.txt
@@ -1,2 +1,2 @@
-</g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]
+Not comparable: </g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]
</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 f7360ab..81298af 100644
--- a/tools/h5diff/testfiles/h5diff_205.txt
+++ b/tools/h5diff/testfiles/h5diff_205.txt
@@ -1,3 +1,3 @@
-</g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
+Not comparable: </g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
</g2/dset6> has rank 2, dimensions [3x2], max dimensions [3x2]
-</g2/dset5> has sign H5T_SGN_2 and </g2/dset6> has sign H5T_SGN_NONE
+Not comparable: </g2/dset5> has sign H5T_SGN_2 and </g2/dset6> has sign H5T_SGN_NONE
diff --git a/tools/h5diff/testfiles/h5diff_206.txt b/tools/h5diff/testfiles/h5diff_206.txt
index 8bbbb9a..164aed9 100644
--- a/tools/h5diff/testfiles/h5diff_206.txt
+++ b/tools/h5diff/testfiles/h5diff_206.txt
@@ -1 +1 @@
-</g2/dset7> has a class H5T_FLOAT and </g2/dset8> has a class H5T_INTEGER
+Not comparable: </g2/dset7> has a class H5T_FLOAT and </g2/dset8> has a class H5T_INTEGER
diff --git a/tools/h5diff/testfiles/h5diff_207.txt b/tools/h5diff/testfiles/h5diff_207.txt
index 833afe8..f8152f8 100644
--- a/tools/h5diff/testfiles/h5diff_207.txt
+++ b/tools/h5diff/testfiles/h5diff_207.txt
@@ -1,2 +1,2 @@
-</g2/dset8> or </g2/dset9> are empty datasets
-</g2/dset8> has 2 members </g2/dset9> has 1 members
+Not comparable: </g2/dset8> or </g2/dset9> are empty datasets
+Not comparable: </g2/dset8> has 2 members </g2/dset9> has 1 members
diff --git a/tools/h5diff/testfiles/h5diff_57.txt b/tools/h5diff/testfiles/h5diff_57.txt
index c1a0d64..a026077 100644
--- a/tools/h5diff/testfiles/h5diff_57.txt
+++ b/tools/h5diff/testfiles/h5diff_57.txt
@@ -2,7 +2,7 @@ dataset: </dset7a> and </dset7b>
Warning: different storage datatype
</dset7a> has file datatype H5T_STD_I8LE
</dset7b> has file datatype H5T_STD_U8LE
-</dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE
+Not comparable: </dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE
0 differences found
--------------------------------
Some objects are not comparable
diff --git a/tools/h5diff/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt
index 42fe6fc..b42cacd 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>
-</dset> or </dset> are empty datasets
+Not comparable: </dset> or </dset> are empty datasets
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 a52b24e..c8ec309 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>
-</g1/arrayd> or </g1/arrayd> are empty datasets
+Not comparable: </g1/arrayd> or </g1/arrayd> are empty datasets
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>
-</g1/enum2D> or </g1/enum2D> are empty datasets
+Not comparable: </g1/enum2D> or </g1/enum2D> are empty datasets
0 differences found
dataset: </g1/enum3D> and </g1/enum3D>
-</g1/enum3D> or </g1/enum3D> are empty datasets
+Not comparable: </g1/enum3D> or </g1/enum3D> are empty datasets
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 71b960e..a513ffa 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>
-</g2/dset1> or </g2/dset1> are empty datasets
+Not comparable: </g2/dset1> or </g2/dset1> are empty datasets
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>
-</g2/dset9> or </g2/dset9> are empty datasets
+Not comparable: </g2/dset9> or </g2/dset9> are empty datasets
0 differences found
--------------------------------
Some objects are not comparable
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index a295585..0f53192 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("<%s> or <%s> are empty datasets\n", obj1_name, obj2_name);
+ parallel_print("Not comparable: <%s> or <%s> are empty datasets\n", obj1_name, obj2_name);
can_compare=0;
options->not_cmp=1;
}
@@ -317,7 +317,7 @@ hsize_t diff_datasetid( hid_t did1,
{
if ((options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name)
{
- parallel_print("<%s> has sign %s ", obj1_name, get_sign(sign1));
+ parallel_print("Not comparable: <%s> has sign %s ", obj1_name, get_sign(sign1));
parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
}
@@ -698,7 +698,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */
if ( is_compound )
{
- parallel_print("<%s> has a class %s and <%s> has a class %s\n",
+ parallel_print("Not comparable: <%s> has a class %s and <%s> has a class %s\n",
obj1_name, get_class(tclass1),
obj2_name, get_class(tclass2) );
@@ -748,7 +748,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */
if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name)
{
- parallel_print("<%s> and <%s> are of class %s\n",
+ parallel_print("Not comparable: <%s> and <%s> are of class %s\n",
obj1_name,obj2_name,get_class(tclass2) );
}
can_compare = 0;
@@ -793,7 +793,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */
if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name)
{
- parallel_print("<%s> has rank %d, dimensions ", obj1_name, rank1);
+ parallel_print("Not comparable: <%s> has rank %d, dimensions ", obj1_name, rank1);
print_dimensions(rank1,dims1);
parallel_print(", max dimensions ");
print_dimensions(rank1,maxdim1);
@@ -836,7 +836,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */
{
if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name)
{
- parallel_print("<%s> has rank %d, dimensions ", obj1_name, rank1);
+ parallel_print("Not comparable: <%s> has rank %d, dimensions ", obj1_name, rank1);
print_dimensions(rank1,dims1);
if (maxdim1 && maxdim2)
{
@@ -895,7 +895,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */
if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name)
{
- parallel_print("<%s> has %d members ", obj1_name, nmembs1);
+ parallel_print("Not comparable: <%s> has %d members ", obj1_name, nmembs1);
parallel_print("<%s> has %d members ", obj2_name, nmembs2);
parallel_print("\n");
}
generated by cgit v0.12 at 2024-11-01 21:16:34 (GMT)