From 26c4f370344ae35029d123b83ff3c53dda8e1947 Mon Sep 17 00:00:00 2001 From: deva Date: Mon, 18 Jan 2010 08:39:22 +0000 Subject: Backported testscript changes from Pentominos --- tools/Makefile.am.test | 4 ++-- tools/testlist | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/Makefile.am.test b/tools/Makefile.am.test index 70382b0..5c5e8c7 100644 --- a/tools/Makefile.am.test +++ b/tools/Makefile.am.test @@ -1,5 +1,5 @@ -Makefile.am.test: ${pracrod_SOURCES} ${EXTRA_DIST} - $(top_srcdir)/../tools/testlist > Makefile.am.test +Makefile.am.test: ${TEST_SOURCE_DEPS} + ${TEST_SCRIPT_DIR}/testlist > Makefile.am.test @touch Makefile.am test: Makefile.am.test $(TESTFILES) diff --git a/tools/testlist b/tools/testlist index fca9d95..a4e7202 100755 --- a/tools/testlist +++ b/tools/testlist @@ -1,5 +1,7 @@ #!/bin/bash +SCRIPTDIR=`dirname $0` + grep "TEST_BEGIN" *.cc > tmp echo -n "TESTFILES=" @@ -22,7 +24,7 @@ do CFLAGS=`cat $FILE | grep "cflags:" | cut -d':' -f2` TEST=test_$NAME echo "$TEST: $FILE $DEPS" - echo -e "\t@../../tools/test $FILE $DEPS $CFLAGS $LIBS" + echo -e "\t@${SCRIPTDIR}/test $FILE $DEPS $CFLAGS $LIBS" echo "" done < tmp -- cgit v1.2.3