From 5e2d5978e48924c576745ae97e6ecc7203666bf3 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 6 Aug 2010 10:04:38 -0500
Subject: [svn-r19181] Added new h5repack test for bug1797 to CMakeLists.txt.
 Added corrected changes to test script for verbose filters

Tested: local linux
---
 tools/h5repack/CMakeLists.txt |  9 ++++++++-
 tools/h5repack/h5repack.sh.in | 25 ++++++++++++++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 31e4e90..a13ab5b 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -106,6 +106,7 @@ IF (BUILD_TESTING)
   SET (FILE15 h5repack_named_dtypes.h5)
   SET (FILE16 tfamily%05d.h5)           # located in common testfiles folder
   SET (FILE_REF h5repack_refs.h5)
+  SET (FILE_ATTR_REF h5repack_attr_refs.h5)
     
   #-- Copy all the HDF5 files from the test directory into the source directory
   SET (HDF5_REFERENCE_TEST_FILES
@@ -113,6 +114,7 @@ IF (BUILD_TESTING)
       ublock.bin
       h5repack.info
       h5repack_attr.h5
+      h5repack_attr_refs.h5
       h5repack_deflate.h5
       h5repack_early.h5
       h5repack_ext.h5
@@ -583,8 +585,13 @@ ADD_H5_TEST (committed_dt "TEST" ${FILE15})
 # tests family driver (file is located in common testfiles folder, uses TOOLTEST1
 #ADD_H5_TEST ( family "FAMILY" ${FILE16})
 
-# test various references (bug 1814)
+# test various references (bug 1814 and 1726)
 ADD_H5_TEST (bug1814 "TEST" ${FILE_REF})
+
+# test attribute with various references (bug 1797)
+# the references in attribute of compund or vlen datatype 
+# TODO: include this test when code portion is completed.
+ADD_H5_TEST (bug1797 "SKIP" ${FILE_ATTR_REF})
   
 ENDIF (BUILD_TESTING)
 
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index 636a4cd..d889b55 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -188,19 +188,19 @@ TOOLTEST1()
 #
 TOOLTESTV() 
 {
-    expect="$srcdir/../testfiles/$1"
-    actual="../testfiles/`basename $1 .ddl`.out"
-    actual_err="../testfiles/`basename $1 .ddl`.err"
-    shift
-
     # Run test.
     TESTING $H5REPACK $@
+    expect="$srcdir/../testfiles/$1.ddl"
+    actual="../testfiles/`basename $1 .ddl`.out"
+    actual_err="../testfiles/`basename $1 .ddl`.err"
 
     infile=$srcdir/testfiles/$1
     path=`pwd`
     outfile=$path/out.$1
     shift
     $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile >$actual 2>$actual_err
+    cp $actual $actual_sav
+    STDOUT_FILTER $actual
     cat $actual_err >> $actual
 
     if cmp -s $expect $actual; then
@@ -212,7 +212,18 @@ TOOLTESTV()
      test yes = "$verbose" && diff -c $expect $actual |sed 's/^/    /'
     fi
     
-#    rm -f $actual $actual_err
+   rm -f $actual $actual_err $actual_sav
+}
+
+STDOUT_FILTER() {
+    result_file=$1
+    tmp_file=/tmp/h5test_tmp_$$
+    # Filter name of files.
+    cp $result_file $tmp_file
+    sed -e '/^Opening file/d' -e '/^Making file/d' \
+    < $tmp_file > $result_file
+    # cleanup
+    rm -f $tmp_file
 }
 
 #
@@ -319,7 +330,7 @@ else
 fi
 
 # verbose gzip with individual object
-arg="$FILE11 -v -f dset_deflate:GZIP=9"
+arg="$FILE11 -v -f /dset_deflate:GZIP=9"
 if test  $USE_FILTER_DEFLATE != "yes" ; then
  SKIP $arg
 else
-- 
cgit v0.12