diff options
Diffstat (limited to 'tools/h5repack/h5repack.sh.in')
-rwxr-xr-x | tools/h5repack/h5repack.sh.in | 57 |
1 files changed, 16 insertions, 41 deletions
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in index 01c33ef..e9aae81 100755 --- a/tools/h5repack/h5repack.sh.in +++ b/tools/h5repack/h5repack.sh.in @@ -96,11 +96,7 @@ SKIP() { DIFFTEST() { VERIFY $@ - if [ "`uname -s`" = "TFLOPS O/S" ]; then - $RUNSERIAL $H5DIFF_BIN -q $@ - else - $RUNSERIAL $H5DIFF_BIN -q "$@" - fi + $RUNSERIAL $H5DIFF_BIN -q "$@" RET=$? if [ $RET != 0 ] ; then echo "*FAILED*" @@ -116,27 +112,20 @@ DIFFTEST() TOOLTEST() { # Run test. - # Tflops interprets "$@" as "" when no parameter is given (e.g., the - # case of missing file name). Changed it to use $@ till Tflops fixes it. TESTING $H5REPACK $@ infile=$srcdir/testfiles/$1 path=`pwd` outfile=$path/out.$1 shift - if [ "`uname -s`" = "TFLOPS O/S" ]; then - $RUNSERIAL $H5REPACK_BIN $@ $infile $outfile - else - $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile - fi - + $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile RET=$? if [ $RET != 0 ] ; then - echo "*FAILED*" - nerrors="`expr $nerrors + 1`" + echo "*FAILED*" + nerrors="`expr $nerrors + 1`" else - echo " PASSED" - DIFFTEST $infile $outfile + echo " PASSED" + DIFFTEST $infile $outfile fi rm -f $outfile } @@ -146,27 +135,20 @@ TOOLTEST() TOOLTEST0() { # Run test. - # Tflops interprets "$@" as "" when no parameter is given (e.g., the - # case of missing file name). Changed it to use $@ till Tflops fixes it. TESTING $H5REPACK $@ infile=$srcdir/testfiles/$1 path=`pwd` outfile=$path/out.$1 shift - if [ "`uname -s`" = "TFLOPS O/S" ]; then - $RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile $@ - else - $RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile "$@" - fi - + $RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile "$@" RET=$? if [ $RET != 0 ] ; then - echo "*FAILED*" - nerrors="`expr $nerrors + 1`" + echo "*FAILED*" + nerrors="`expr $nerrors + 1`" else - echo " PASSED" - DIFFTEST $infile $outfile + echo " PASSED" + DIFFTEST $infile $outfile fi rm -f $outfile } @@ -178,27 +160,20 @@ TOOLTEST0() TOOLTEST1() { # Run test. - # Tflops interprets "$@" as "" when no parameter is given (e.g., the - # case of missing file name). Changed it to use $@ till Tflops fixes it. TESTING $H5REPACK $@ infile=$srcdir/../testfiles/$1 path=`pwd` outfile=$path/out.$1 shift - if [ "`uname -s`" = "TFLOPS O/S" ]; then - $RUNSERIAL $H5REPACK_BIN $@ $infile $outfile - else - $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile - fi - + $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile RET=$? if [ $RET != 0 ] ; then - echo "*FAILED*" - nerrors="`expr $nerrors + 1`" + echo "*FAILED*" + nerrors="`expr $nerrors + 1`" else - echo " PASSED" - DIFFTEST $infile $outfile + echo " PASSED" + DIFFTEST $infile $outfile fi rm -f $outfile } |