diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-06 18:06:30 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-06 18:06:30 (GMT) |
commit | ab1051e0b00552006f4cc37d97cbf505fdc6eb3c (patch) | |
tree | 115b1523a743acf5323b4861313a0a672621e3d7 /tools/h5repack/h5repack.sh.in | |
parent | ae32ba97fdc56b4b5ebf473dda4b51dbbd1089ff (diff) | |
download | hdf5-ab1051e0b00552006f4cc37d97cbf505fdc6eb3c.zip hdf5-ab1051e0b00552006f4cc37d97cbf505fdc6eb3c.tar.gz hdf5-ab1051e0b00552006f4cc37d97cbf505fdc6eb3c.tar.bz2 |
[svn-r19184] Corrected h5repack verbose test for windows
Updated tools/lib source dir variable for source list
Tested: local linux
Diffstat (limited to 'tools/h5repack/h5repack.sh.in')
-rwxr-xr-x | tools/h5repack/h5repack.sh.in | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in index fee30bf..94bdf04 100755 --- a/tools/h5repack/h5repack.sh.in +++ b/tools/h5repack/h5repack.sh.in @@ -187,19 +187,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 @@ -211,7 +211,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 } # @@ -318,7 +329,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 |