From 98fd512f9a477539a322906cf7a59c7cb75f48a5 Mon Sep 17 00:00:00 2001 From: Will Estes Date: Fri, 20 May 2016 14:16:14 -0400 Subject: [PATCH] test: drop .exe when making input file names --- tests/testwrapper.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh index 051e20b..e18062f 100755 --- a/tests/testwrapper.sh +++ b/tests/testwrapper.sh @@ -30,7 +30,7 @@ while getopts :d:i:rt1 OPTION ; do TESTNAME="${!OPTIND}" -INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename $TESTNAME`.txt} +INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename ${TESTNAME%.exe}`.txt} if [ "$DO_COMPARISON" -eq "1" ] ; then test `$TESTNAME 1 < $INPUT_NAME` -eq `$TESTNAME < $INPUT_NAME` @@ -38,15 +38,15 @@ if [ "$DO_COMPARISON" -eq "1" ] ; then fi if [ $INPUT_COUNT -gt 1 ] ; then - $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} ${INPUT_NAME} + $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME%.exe}.tables} ${INPUT_NAME} exit $? fi if [ -f ${INPUT_NAME} ] ; then if [ $USE_REDIRECT == 1 ] ; then - $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_NAME + $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME%.exe}.tables} < $INPUT_NAME else - $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_NAME + $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME%.exe}.tables} $INPUT_NAME fi else $TESTNAME -- 2.40.0