Fix script varnames

This commit is contained in:
Allen Byrne 2017-01-18 09:46:50 -06:00
parent ee4c57cc08
commit a8e9126054

View File

@ -173,18 +173,6 @@ VERIFY() {
# If $1 == ignorecase then do caseless CMP and DIFF.
# ADD_H5_TEST
TOOLTEST() {
# check if caseless compare and diff requested
if [ "$1" = ignorecase ]; then
caseless="-i"
# replace cmp with diff which runs much longer.
xCMP="$DIFF -i"
shift
else
caseless=""
# stick with faster cmp if ignorecase is not requested.
xCMP="$CMP"
fi
expect="$TESTDIR/$1"
actual="$TESTDIR/`basename $1 .ddl`.out"
actual_err="$TESTDIR/`basename $1 .ddl`.err"
@ -193,10 +181,10 @@ TOOLTEST() {
shift
# Run test.
TESTING $DUMPER $@
TESTING $H5DUMP $@
(
cd $TESTDIR
$ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
$ENVCMD $RUNSERIAL $H5DUMP_BIN "$@"
) >$actual 2>$actual_err
# save actual and actual_err in case they are needed later.
@ -210,7 +198,7 @@ TOOLTEST() {
# Create the expect file if it doesn't yet exist.
echo " CREATED"
cp $actual $expect
elif $xCMP $expect $actual > /dev/null 2>&1 ; then
elif $CMP $expect $actual > /dev/null 2>&1 ; then
echo " PASSED"
else
echo "*FAILED*"