diff options
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rwxr-xr-x | tests/testwrapper.sh | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 88c84e3..428e4b2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,7 +33,7 @@ LOG_COMPILER = $(srcdir)/testwrapper.sh AM_LOG_FLAGS = -d $(srcdir) -r REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh -AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r +AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t @@ -435,7 +435,7 @@ tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sert tableopts_c := $(addsuffix .c,$(tableopts_tests)) OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh -AM_OPT_LOG_FLAGS = -d $(srcdir) -i tableopts.txt -r +AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r tableopts_opt_nr%.c: tableopts.l4 $(FLEX) $(FLEX) -P $(subst -,_,$(basename $(*F))) $* -o $@ $< diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh index 30127b5..051e20b 100755 --- a/tests/testwrapper.sh +++ b/tests/testwrapper.sh @@ -30,10 +30,10 @@ while getopts :d:i:rt1 OPTION ; do TESTNAME="${!OPTIND}" -INPUT_NAME=${INPUT_NAME:-`basename $TESTNAME`.txt} +INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename $TESTNAME`.txt} if [ "$DO_COMPARISON" -eq "1" ] ; then - test `$TESTNAME 1 < $INPUT_DIRECTORY/$INPUT_NAME` -eq `$TESTNAME < $INPUT_DIRECTORY/$INPUT_NAME` + test `$TESTNAME 1 < $INPUT_NAME` -eq `$TESTNAME < $INPUT_NAME` exit $? fi @@ -42,11 +42,11 @@ if [ $INPUT_COUNT -gt 1 ] ; then exit $? fi -if [ -f ${INPUT_DIRECTORY}/${INPUT_NAME} ] ; then +if [ -f ${INPUT_NAME} ] ; then if [ $USE_REDIRECT == 1 ] ; then - $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_DIRECTORY/$INPUT_NAME + $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_NAME else - $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_DIRECTORY/$INPUT_NAME + $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_NAME fi else $TESTNAME |