diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5copy/testh5copy.sh | 12 | ||||
| -rwxr-xr-x | tools/h5diff/testh5diff.sh | 9 | ||||
| -rw-r--r-- | tools/h5dump/testh5dump.sh.in | 16 | ||||
| -rw-r--r-- | tools/h5ls/h5ls.c | 3 | ||||
| -rwxr-xr-x | tools/h5repack/h5repack.sh.in | 57 |
5 files changed, 23 insertions, 74 deletions
diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh index c1d0309..c374e08 100644 --- a/tools/h5copy/testh5copy.sh +++ b/tools/h5copy/testh5copy.sh @@ -167,11 +167,7 @@ TOOLTEST_FAIL() H5DIFFTEST() { 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*" @@ -186,11 +182,7 @@ H5DIFFTEST() H5DIFFTEST_FAIL() { 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 != 1 ] ; then diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh index 005a736..d6550fd 100755 --- a/tools/h5diff/testh5diff.sh +++ b/tools/h5diff/testh5diff.sh @@ -201,19 +201,12 @@ TOOLTEST() { fi # 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 $H5DIFF $@ ( #echo "#############################" #echo "Expected output for '$H5DIFF $@'" #echo "#############################" #cd $srcdir/testfiles - if [ "`uname -s`" = "TFLOPS O/S" ]; then - eval $RUNCMD $H5DIFF_BIN $@ - else - eval $RUNCMD $H5DIFF_BIN "$@" - fi + eval $RUNCMD $H5DIFF_BIN "$@" ) >$actual 2>$actual_err # save actual and actual_err in case they are needed later. cp $actual $actual_sav diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index 9dcb562..9e6cb01 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -161,12 +161,8 @@ DIFFTEST() { PRINT_H5DIFF $@ ( - cd $srcdir/../testfiles - if [ "`uname -s`" = "TFLOPS O/S" ]; then - $RUNSERIAL $H5DIFF_BIN $@ -q - else - $RUNSERIAL $H5DIFF_BIN "$@" -q - fi + cd $srcdir/../testfiles + $RUNSERIAL $H5DIFF_BIN "$@" -q ) RET=$? if [ $RET != 0 ] ; then @@ -198,12 +194,8 @@ IMPORTTEST() PRINT_H5IMPORT $@ ( - cd $srcdir/../testfiles - if [ "`uname -s`" = "TFLOPS O/S" ]; then - $RUNSERIAL $H5IMPORT_BIN $@ - else - $RUNSERIAL $H5IMPORT_BIN "$@" - fi + cd $srcdir/../testfiles + $RUNSERIAL $H5IMPORT_BIN "$@" ) RET=$? if [ $RET != 0 ] ; then diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index ca0ddcb..a2dc128 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -2109,15 +2109,12 @@ get_width(void) width = w[0]; } #elif defined(H5_HAVE_TIOCGWINSZ) && defined(H5_HAVE_IOCTL) -#ifndef __PUMAGON__ -/* the ioctl() call coredump on TFLOPS. Turn it off for now. */ { /* Unix with ioctl(TIOCGWINSZ) */ struct winsize w; if (ioctl(2, TIOCGWINSZ, &w)>=0 && w.ws_col>0) width = w.ws_col; } -#endif #elif defined(H5_HAVE_TIOCGETD) && defined(H5_HAVE_IOCTL) { /* Unix with ioctl(TIOCGETD) */ 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 } |