[svn-r18135] Purpose:

Additional fix relted to the fix of bug1672.

Description:
    The fix of bug1672 caused some changes of output which required modifying
    some test cases.  After some discussion, restoring the changes of the test 
    cases was decided.  After many experiments for the solution, this fix was 
    made so the code which improved performance can stay.

Tested on Jam.

tools/h5diff/testfiles/h5diff_200.txt

@@ -1,4 +1,3 @@
-dataset: </g2/dset1> and </g2/dset2>
 --------------------------------
 Some objects are not comparable
 --------------------------------

tools/h5diff/testfiles/h5diff_201.txt

@@ -1,2 +1 @@
-dataset: </g2/dset1> and </g2/dset2>
 Not comparable: </g2/dset1> or </g2/dset2> is an empty dataset

tools/h5diff/testfiles/h5diff_202.txt

@@ -1,3 +1,2 @@
-dataset: </g2/dset2> and </g2/dset3>
 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

tools/h5diff/testfiles/h5diff_203.txt

@@ -1,3 +1,2 @@
-dataset: </g2/dset3> and </g2/dset4>
 Not comparable: </g2/dset3> has rank 1, dimensions [6], max dimensions [6]
 and </g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]

tools/h5diff/testfiles/h5diff_204.txt

@@ -1,3 +1,2 @@
-dataset: </g2/dset4> and </g2/dset5>
 Not comparable: </g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]
 and </g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]

tools/h5diff/testfiles/h5diff_205.txt

@@ -1,4 +1,3 @@
-dataset: </g2/dset5> and </g2/dset6>
 Not comparable: </g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
 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

tools/h5diff/testfiles/h5diff_206.txt

@@ -1,2 +1 @@
-dataset: </g2/dset7> and </g2/dset8>
 Not comparable: </g2/dset7> has a class H5T_FLOAT and </g2/dset8> has a class H5T_INTEGER

tools/h5diff/testfiles/h5diff_207.txt

@@ -1,3 +1,2 @@
-dataset: </g2/dset8> and </g2/dset9>
 Not comparable: </g2/dset8> or </g2/dset9> is an empty dataset
 Not comparable: </g2/dset8> has 2 members </g2/dset9> has 1 members 

tools/h5diff/testfiles/h5diff_609.txt

@@ -1,2 +0,0 @@
-dataset: </g1/dset3> and </g1/dset4>
-0 differences found

tools/h5diff/testfiles/h5diff_618.txt

@@ -1,2 +0,0 @@
-dataset: </g1/dset3> and </g1/dset4>
-0 differences found