summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2009-05-20 14:23:23 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2009-05-20 14:23:23 (GMT)
commitfa656be59d1335d0c8d8c68314273544b523f41e (patch)
treea6e14d3d05f564eb47ab4bb0524a28e7d5986f82 /tools
parent1ad6816d1555afd8cc5cf03f1e8df60dca8f4914 (diff)
downloadhdf5-fa656be59d1335d0c8d8c68314273544b523f41e.zip
hdf5-fa656be59d1335d0c8d8c68314273544b523f41e.tar.gz
hdf5-fa656be59d1335d0c8d8c68314273544b523f41e.tar.bz2
[svn-r16965] merge 16964 from trunk
bug fix: the phrase "Not comparable" was not being printed for the case of different classes tested: windows, linux
Diffstat (limited to 'tools')
-rw-r--r--tools/h5diff/testfiles/h5diff_202.txt2
-rw-r--r--tools/lib/h5diff_dset.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5diff/testfiles/h5diff_202.txt b/tools/h5diff/testfiles/h5diff_202.txt
index ee240c2..fd4a191 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
+Not comparable: </g2/dset2> is of class H5T_FLOAT and </g2/dset3> is of class H5T_INTEGER
Not comparable: </g2/dset2> has sign H5T_SGN_ERROR and </g2/dset3> has sign H5T_SGN_2
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 0f53192..bbfa351 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -708,7 +708,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */
{
- parallel_print("<%s> is of class %s and <%s> is of class %s\n",
+ parallel_print("Not comparable: <%s> is of class %s and <%s> is of class %s\n",
obj1_name, get_class(tclass1),
obj2_name, get_class(tclass2) );