[svn-r6789] Purpose:

new feature

Description:
during the sequencial match list, by default the differences between matched datasets were printed.
added an -m option that allows to turn this off, just printing the file differences

Solution:

Platforms tested:
Linux 2.4 (rockaway)
SunOS 5.7 (arabica)
IRIX 6.5 (modi4)



Misc. update:

30 files changed, 35 insertions, 149 deletions

diff --git a/tools/h5diff/h5diff.c b/tools/h5diff/h5diff.c
index 4031b88..0d5f587 100644
--- a/tools/h5diff/h5diff.c
+++ b/tools/h5diff/h5diff.c
@@ -36,6 +36,7 @@ typedef struct options_t
  double p_relative; /* relative error value */
  int    n_; /* count */
  int    n_number_count; /* value */
+ int    m_; /* do not make the diff on a sequencial match, default yes */
 } options_t;
 
 /*-------------------------------------------------------------------------
@@ -114,6 +115,7 @@ void usage(void)
  printf("[-n count]        Print difference up to count number for each variable\n");
  printf("[-d delta]        Print difference when it is greater than limit delta\n");
  printf("[-p relative]     Print differences which are within a relative error value\n");
+ printf("[-m ]             Print differences on a sequencial match iteration\n");
 }
 
 
@@ -167,8 +169,6 @@ int main(int argc, const char *argv[])
  const char *obj1_name  = NULL;
  const char *obj2_name  = NULL;
  
- /*do_test_files();*/
-
 
 /*-------------------------------------------------------------------------
  * print the command line options
@@ -219,6 +219,9 @@ int main(int argc, const char *argv[])
     case 'r': 
      options.r_ = 1;
      break;
+    case 'm': 
+     options.m_ = 1;
+     break;
     case 'd': 
      /* if it is not another option */
      if ( '-' !=argv[i+1][0] )
@@ -726,8 +729,11 @@ void match( hid_t file1_id, const char *file1_name, int nobjects1, info_t *info1
     info1[curr1].name, file1_name, info2[curr2].name, file2_name);
 
    /* do the diff */
-   diff( file1_id, info1[curr1].name, file2_id, info1[curr1].name, options, 
-         info1[curr1].type );
+   if ( options.m_ )
+   {
+    diff( file1_id, info1[curr1].name, file2_id, info1[curr1].name, options, 
+          info1[curr1].type );
+   }
 
    curr1++;
    curr2++;
@@ -769,7 +775,7 @@ void match( hid_t file1_id, const char *file1_name, int nobjects1, info_t *info1
   while ( curr2<nobjects2 )
   {
    printf( "<%s> is in <%s>, but not in <%s>\n", info2[curr2].name, 
-    file1_name, file2_name);
+    file2_name, file1_name);
    curr2++;
   }
  }
diff --git a/tools/h5diff/h5difftst.c b/tools/h5diff/h5difftst.c
index 912ec33..c795b55 100644
--- a/tools/h5diff/h5difftst.c
+++ b/tools/h5diff/h5difftst.c
@@ -738,10 +738,10 @@ int do_test_files(void)
  *-------------------------------------------------------------------------
  */
 
- write_dataset(file3_id,1,dims1_1,"dset3",H5T_NATIVE_INT,0);
- write_dataset(file4_id,1,dims1_1,"dset3",H5T_NATIVE_INT,0);
- write_dataset(file3_id,1,dims1_1,"dset4",H5T_NATIVE_INT,0);
- write_dataset(file4_id,1,dims1_1,"dset5",H5T_NATIVE_INT,0);
+ write_dataset(file3_id,1,dims1_1,"dset_A",H5T_NATIVE_INT,0);
+ write_dataset(file4_id,1,dims1_1,"dset_A",H5T_NATIVE_INT,0);
+ write_dataset(file3_id,1,dims1_1,"dset_B",H5T_NATIVE_INT,0);
+ write_dataset(file4_id,1,dims1_1,"dset_C",H5T_NATIVE_INT,0);
 
 
 
diff --git a/tools/testfiles/h5diff_01.txt b/tools/testfiles/h5diff_01.txt
index 77266d9..a17fd15 100644
--- a/tools/testfiles/h5diff_01.txt
+++ b/tools/testfiles/h5diff_01.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_02.txt b/tools/testfiles/h5diff_02.txt
index 84165ce..3e43b23 100644
--- a/tools/testfiles/h5diff_02.txt
+++ b/tools/testfiles/h5diff_02.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_031.txt b/tools/testfiles/h5diff_031.txt
index f8e44f0..930bad5 100644
--- a/tools/testfiles/h5diff_031.txt
+++ b/tools/testfiles/h5diff_031.txt
@@ -15,3 +15,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_032.txt b/tools/testfiles/h5diff_032.txt
index c5cb384..84e41bc 100644
--- a/tools/testfiles/h5diff_032.txt
+++ b/tools/testfiles/h5diff_032.txt
@@ -43,7 +43,6 @@ File <h5diff_test2.h5>: # of entries = 15
 /g1.1                group
 
 </compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
-</compound> and </compound> are of type H5G_TYPE
 </dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -57,22 +56,8 @@ File <h5diff_test2.h5>: # of entries = 15
 </dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
-Comparing </dset1.7> with </dset1.7>
-Warning: </dset1.7> has different maximum dimensions than </dset1.7>
-</dset1.7>: [ 7 ]
-</dset1.7>: [ 8 ]
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-Comparing </dset1.8> with </dset1.8>
-Warning: </dset1.8> has different storage datatype than </dset1.8>
-</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-Comparing </dset1.9> with </dset1.9>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -86,8 +71,6 @@ using memory type H5T_NATIVE_INT
 </dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
-</enum> and </enum> are of type H5G_TYPE
 </g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</g1.1> and </g1.1> are of type H5G_GROUP
 </soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 
diff --git a/tools/testfiles/h5diff_033.txt b/tools/testfiles/h5diff_033.txt
index a6fdb87..a5d4121 100644
--- a/tools/testfiles/h5diff_033.txt
+++ b/tools/testfiles/h5diff_033.txt
@@ -3,7 +3,6 @@ Expected output for 'h5diff -r h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff -r h5diff_test1.h5 h5diff_test2.h5
 </compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
-</compound> and </compound> are of type H5G_TYPE
 </dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -17,22 +16,8 @@ $h5diff -r h5diff_test1.h5 h5diff_test2.h5
 </dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
-Comparing </dset1.7> with </dset1.7>
-Warning: </dset1.7> has different maximum dimensions than </dset1.7>
-</dset1.7>: [ 7 ]
-</dset1.7>: [ 8 ]
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-Comparing </dset1.8> with </dset1.8>
-Warning: </dset1.8> has different storage datatype than </dset1.8>
-</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-Comparing </dset1.9> with </dset1.9>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -46,8 +31,6 @@ using memory type H5T_NATIVE_INT
 </dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
-</enum> and </enum> are of type H5G_TYPE
 </g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</g1.1> and </g1.1> are of type H5G_GROUP
 </soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 
diff --git a/tools/testfiles/h5diff_041.txt b/tools/testfiles/h5diff_041.txt
index 4626647..1aae7b0 100644
--- a/tools/testfiles/h5diff_041.txt
+++ b/tools/testfiles/h5diff_041.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_042.txt b/tools/testfiles/h5diff_042.txt
index 3c35097..819373f 100644
--- a/tools/testfiles/h5diff_042.txt
+++ b/tools/testfiles/h5diff_042.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_043.txt b/tools/testfiles/h5diff_043.txt
index f883bea..135b16f 100644
--- a/tools/testfiles/h5diff_043.txt
+++ b/tools/testfiles/h5diff_043.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_044.txt b/tools/testfiles/h5diff_044.txt
index e4af45e..3a76d2f 100644
--- a/tools/testfiles/h5diff_044.txt
+++ b/tools/testfiles/h5diff_044.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_045.txt b/tools/testfiles/h5diff_045.txt
index 2ded53a..629ab09 100644
--- a/tools/testfiles/h5diff_045.txt
+++ b/tools/testfiles/h5diff_045.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_046.txt b/tools/testfiles/h5diff_046.txt
index 659be75..8dac2c5 100644
--- a/tools/testfiles/h5diff_046.txt
+++ b/tools/testfiles/h5diff_046.txt
@@ -3,7 +3,6 @@ Expected output for 'h5diff -d 1 h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff -d 1 h5diff_test1.h5 h5diff_test2.h5
 </compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
-</compound> and </compound> are of type H5G_TYPE
 </dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -17,22 +16,8 @@ $h5diff -d 1 h5diff_test1.h5 h5diff_test2.h5
 </dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
-Comparing </dset1.7> with </dset1.7>
-Warning: </dset1.7> has different maximum dimensions than </dset1.7>
-</dset1.7>: [ 7 ]
-</dset1.7>: [ 8 ]
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-Comparing </dset1.8> with </dset1.8>
-Warning: </dset1.8> has different storage datatype than </dset1.8>
-</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-Comparing </dset1.9> with </dset1.9>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -46,8 +31,6 @@ using memory type H5T_NATIVE_INT
 </dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
-</enum> and </enum> are of type H5G_TYPE
 </g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</g1.1> and </g1.1> are of type H5G_GROUP
 </soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 
diff --git a/tools/testfiles/h5diff_047.txt b/tools/testfiles/h5diff_047.txt
index acb0eca..edf2d7c 100644
--- a/tools/testfiles/h5diff_047.txt
+++ b/tools/testfiles/h5diff_047.txt
@@ -3,7 +3,6 @@ Expected output for 'h5diff -d 1 -d 2 h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff -d 1 -d 2 h5diff_test1.h5 h5diff_test2.h5
 </compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
-</compound> and </compound> are of type H5G_TYPE
 </dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -17,22 +16,8 @@ $h5diff -d 1 -d 2 h5diff_test1.h5 h5diff_test2.h5
 </dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
-Comparing </dset1.7> with </dset1.7>
-Warning: </dset1.7> has different maximum dimensions than </dset1.7>
-</dset1.7>: [ 7 ]
-</dset1.7>: [ 8 ]
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-Comparing </dset1.8> with </dset1.8>
-Warning: </dset1.8> has different storage datatype than </dset1.8>
-</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-Comparing </dset1.9> with </dset1.9>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -46,8 +31,6 @@ using memory type H5T_NATIVE_INT
 </dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
-</enum> and </enum> are of type H5G_TYPE
 </g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</g1.1> and </g1.1> are of type H5G_GROUP
 </soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 
diff --git a/tools/testfiles/h5diff_051.txt b/tools/testfiles/h5diff_051.txt
index 732585b..a9edb90 100644
--- a/tools/testfiles/h5diff_051.txt
+++ b/tools/testfiles/h5diff_051.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_052.txt b/tools/testfiles/h5diff_052.txt
index 5e0198d..1ac0dc5 100644
--- a/tools/testfiles/h5diff_052.txt
+++ b/tools/testfiles/h5diff_052.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_053.txt b/tools/testfiles/h5diff_053.txt
index 64a8e83..2581223 100644
--- a/tools/testfiles/h5diff_053.txt
+++ b/tools/testfiles/h5diff_053.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_054.txt b/tools/testfiles/h5diff_054.txt
index 99b860b..f7acc60 100644
--- a/tools/testfiles/h5diff_054.txt
+++ b/tools/testfiles/h5diff_054.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_055.txt b/tools/testfiles/h5diff_055.txt
index 941aeb7..53cfaf4 100644
--- a/tools/testfiles/h5diff_055.txt
+++ b/tools/testfiles/h5diff_055.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_056.txt b/tools/testfiles/h5diff_056.txt
index 43dcaca..783a738 100644
--- a/tools/testfiles/h5diff_056.txt
+++ b/tools/testfiles/h5diff_056.txt
@@ -3,7 +3,6 @@ Expected output for 'h5diff -p 1 h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff -p 1 h5diff_test1.h5 h5diff_test2.h5
 </compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
-</compound> and </compound> are of type H5G_TYPE
 </dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -17,22 +16,8 @@ $h5diff -p 1 h5diff_test1.h5 h5diff_test2.h5
 </dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
-Comparing </dset1.7> with </dset1.7>
-Warning: </dset1.7> has different maximum dimensions than </dset1.7>
-</dset1.7>: [ 7 ]
-</dset1.7>: [ 8 ]
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-Comparing </dset1.8> with </dset1.8>
-Warning: </dset1.8> has different storage datatype than </dset1.8>
-</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-Comparing </dset1.9> with </dset1.9>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -46,8 +31,6 @@ using memory type H5T_NATIVE_INT
 </dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
-</enum> and </enum> are of type H5G_TYPE
 </g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</g1.1> and </g1.1> are of type H5G_GROUP
 </soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 
diff --git a/tools/testfiles/h5diff_057.txt b/tools/testfiles/h5diff_057.txt
index f938c6c..e5ef529 100644
--- a/tools/testfiles/h5diff_057.txt
+++ b/tools/testfiles/h5diff_057.txt
@@ -3,7 +3,6 @@ Expected output for 'h5diff -p 1 -p 2 h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff -p 1 -p 2 h5diff_test1.h5 h5diff_test2.h5
 </compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
-</compound> and </compound> are of type H5G_TYPE
 </dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -17,22 +16,8 @@ $h5diff -p 1 -p 2 h5diff_test1.h5 h5diff_test2.h5
 </dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
-Comparing </dset1.7> with </dset1.7>
-Warning: </dset1.7> has different maximum dimensions than </dset1.7>
-</dset1.7>: [ 7 ]
-</dset1.7>: [ 8 ]
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-Comparing </dset1.8> with </dset1.8>
-Warning: </dset1.8> has different storage datatype than </dset1.8>
-</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-Comparing </dset1.9> with </dset1.9>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -46,8 +31,6 @@ using memory type H5T_NATIVE_INT
 </dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
-</enum> and </enum> are of type H5G_TYPE
 </g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</g1.1> and </g1.1> are of type H5G_GROUP
 </soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 
diff --git a/tools/testfiles/h5diff_061.txt b/tools/testfiles/h5diff_061.txt
index cb94a5c..53fdaa6 100644
--- a/tools/testfiles/h5diff_061.txt
+++ b/tools/testfiles/h5diff_061.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_0610.txt b/tools/testfiles/h5diff_0610.txt
index 9474f5b..9e0a31e 100644
--- a/tools/testfiles/h5diff_0610.txt
+++ b/tools/testfiles/h5diff_0610.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_062.txt b/tools/testfiles/h5diff_062.txt
index cd17bf3..ff78a95 100644
--- a/tools/testfiles/h5diff_062.txt
+++ b/tools/testfiles/h5diff_062.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_063.txt b/tools/testfiles/h5diff_063.txt
index a743f16..1e8fdc5 100644
--- a/tools/testfiles/h5diff_063.txt
+++ b/tools/testfiles/h5diff_063.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_064.txt b/tools/testfiles/h5diff_064.txt
index 5ec8067..0067ac4 100644
--- a/tools/testfiles/h5diff_064.txt
+++ b/tools/testfiles/h5diff_064.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_065.txt b/tools/testfiles/h5diff_065.txt
index 99f4f7d..cb2909e 100644
--- a/tools/testfiles/h5diff_065.txt
+++ b/tools/testfiles/h5diff_065.txt
@@ -16,3 +16,4 @@ file2_name        File name of the second HDF5 file
 [-n count]        Print difference up to count number for each variable
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print differences which are within a relative error value
+[-m ]             Print differences on a sequencial match iteration
diff --git a/tools/testfiles/h5diff_066.txt b/tools/testfiles/h5diff_066.txt
index 99afe18..7fdf701 100644
--- a/tools/testfiles/h5diff_066.txt
+++ b/tools/testfiles/h5diff_066.txt
@@ -3,7 +3,6 @@ Expected output for 'h5diff -n 1 h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff -n 1 h5diff_test1.h5 h5diff_test2.h5
 </compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
-</compound> and </compound> are of type H5G_TYPE
 </dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -17,22 +16,8 @@ $h5diff -n 1 h5diff_test1.h5 h5diff_test2.h5
 </dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
-Comparing </dset1.7> with </dset1.7>
-Warning: </dset1.7> has different maximum dimensions than </dset1.7>
-</dset1.7>: [ 7 ]
-</dset1.7>: [ 8 ]
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-Comparing </dset1.8> with </dset1.8>
-Warning: </dset1.8> has different storage datatype than </dset1.8>
-</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-Comparing </dset1.9> with </dset1.9>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -46,8 +31,6 @@ using memory type H5T_NATIVE_INT
 </dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
-</enum> and </enum> are of type H5G_TYPE
 </g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</g1.1> and </g1.1> are of type H5G_GROUP
 </soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 
diff --git a/tools/testfiles/h5diff_067.txt b/tools/testfiles/h5diff_067.txt
index 98b6085..634e511 100644
--- a/tools/testfiles/h5diff_067.txt
+++ b/tools/testfiles/h5diff_067.txt
@@ -3,7 +3,6 @@ Expected output for 'h5diff -n 1 -n 2 h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff -n 1 -n 2 h5diff_test1.h5 h5diff_test2.h5
 </compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
-</compound> and </compound> are of type H5G_TYPE
 </dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -17,22 +16,8 @@ $h5diff -n 1 -n 2 h5diff_test1.h5 h5diff_test2.h5
 </dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
-Comparing </dset1.7> with </dset1.7>
-Warning: </dset1.7> has different maximum dimensions than </dset1.7>
-</dset1.7>: [ 7 ]
-</dset1.7>: [ 8 ]
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-Comparing </dset1.8> with </dset1.8>
-Warning: </dset1.8> has different storage datatype than </dset1.8>
-</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-Comparing </dset1.9> with </dset1.9>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
@@ -46,8 +31,6 @@ using memory type H5T_NATIVE_INT
 </dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 </dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
 </enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
-</enum> and </enum> are of type H5G_TYPE
 </g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</g1.1> and </g1.1> are of type H5G_GROUP
 </soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
 
diff --git a/tools/testfiles/h5diff_30.txt b/tools/testfiles/h5diff_30.txt
index 1dfec59..03d6887 100644
--- a/tools/testfiles/h5diff_30.txt
+++ b/tools/testfiles/h5diff_30.txt
@@ -3,9 +3,6 @@ Expected output for 'h5diff h5diff_test3.h5 h5diff_test4.h5'
 #############################
 $h5diff h5diff_test3.h5 h5diff_test4.h5
 </dset3> found in <h5diff_test3.h5> and </dset3> found in <h5diff_test4.h5>
-Comparing </dset3> with </dset3>
-using memory type H5T_NATIVE_INT
-0 differences found
 </dset4> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5>
-</dset5> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5>
+</dset5> is in <h5diff_test4.h5>, but not in <h5diff_test3.h5>