[svn-r15433] http://bugzilla.hdfgroup.uiuc.edu/show_bug.cgi?id=1170

Summary: when using h5diff to compare the results of h5repack (or other tools that copy one HDF5 file to another), a new option is needed to allow h5diff to make an "absolute" comparison of the 2 files. This is the "contents" mode explained in the usage below.


If this mode is present, objects in both files must match (must be exactly the same). If this does not happen, the tool returns an error code of 1 (instead of the success code of 0)


Changes to the h5repack test script: the call to h5diff was changed to include -c (maintaining the previous -q). 


tested: windows, linux

2 files changed, 5 insertions, 2 deletions

diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index 77be575..e6d9a98 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -93,9 +93,9 @@ DIFFTEST()
 {
     VERIFY  $@
     if [ "`uname -s`" = "TFLOPS O/S" ]; then
-     $RUNSERIAL $H5DIFF_BIN -q $@ 
+     $RUNSERIAL $H5DIFF_BIN -q -c $@ 
     else
-     $RUNSERIAL $H5DIFF_BIN -q "$@" 
+     $RUNSERIAL $H5DIFF_BIN -q -c "$@" 
     fi
     RET=$?
     if [ $RET != 0 ] ; then
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index 99448c4..3796179 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -152,6 +152,9 @@ int main (void)
  memset(&diff_options, 0, sizeof (diff_opt_t));
  memset(&pack_options, 0, sizeof (pack_opt_t));
 
+ /* set h5diff "contents" mode */
+ diff_options.m_contents = 1;
+
  /* run tests  */
  puts("Testing h5repack:");