From: edwin <none@none>
Date: Tue, 19 Sep 2006 09:41:53 +0000 (+0000)
Subject: * tests/regression/jasmin/runtest: Display only the basename of tests.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=79b3ac3da37c41f415c58475896f49d92b5e53f0;p=cacao.git

* tests/regression/jasmin/runtest: Display only the basename of tests.
* tests/regression/jasmin/Makefile.am: Use $(srcdir) to locate the
runtest script.

--HG--
branch : unified_variables
---

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index bf4006908..00078c7b3 100644
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -104,7 +104,7 @@ CLEANFILES = \
 	TESTLOG TESTEXPECT TESTOUT TESTERR
 
 check:
-	JAVA=$(JAVA) JAVAFLAGS=$(JAVAFLAGS) ./runtest $(JASMIN_TESTS)
+	JAVA=$(JAVA) JAVAFLAGS=$(JAVAFLAGS) $(srcdir)/runtest $(JASMIN_TESTS)
 
 ## Local variables:
 ## mode: Makefile
diff --git a/tests/regression/jasmin/runtest b/tests/regression/jasmin/runtest
index da36c5143..341de56a2 100755
--- a/tests/regression/jasmin/runtest
+++ b/tests/regression/jasmin/runtest
@@ -65,7 +65,7 @@ do
 	TESTSTATUS=$?
 
 	if [ $TESTSTATUS -ne $EXPECTSTATUS ] ; then
-		echo $ECHOFLAGS "${FAILCOLOR}FAIL: $TEST - expected status $EXPECTSTATUS, but got $TESTSTATUS${NOCOLOR}"
+		echo $ECHOFLAGS "${FAILCOLOR}FAIL: $TESTBASENAME - expected status $EXPECTSTATUS, but got $TESTSTATUS${NOCOLOR}"
 		EXITCODE=1
 	fi
 
@@ -74,10 +74,10 @@ do
 
 		if diff -u "$TESTEXPECT" "$TESTOUT" ; then
 			if [ $TESTSTATUS -eq 0 ] ; then
-				echo $ECHOFLAGS "${PASSCOLOR}PASS: $TEST${NOCOLOR}"
+				echo $ECHOFLAGS "${PASSCOLOR}PASS: $TESTBASENAME${NOCOLOR}"
 			fi
 		else
-			echo $ECHOFLAGS "${FAILCOLOR}FAIL: $TEST - wrong output${NOCOLOR}"
+			echo $ECHOFLAGS "${FAILCOLOR}FAIL: $TESTBASENAME - wrong output${NOCOLOR}"
 			EXITCODE=1
 		fi
 
@@ -87,9 +87,9 @@ do
 		fi
 	else
 		if grep "$EXPECTERROR" "$TESTERR" >/dev/null ; then
-			echo $ECHOFLAGS "${PASSCOLOR}PASS: $TEST - got expected error: $EXPECTERROR${NOCOLOR}"
+			echo $ECHOFLAGS "${PASSCOLOR}PASS: $TESTBASENAME - got expected error: $EXPECTERROR${NOCOLOR}"
 		else
-			echo $ECHOFLAGS "${FAILCOLOR}FAIL: $TEST - did not get expected error: $EXPECTERROR${NOCOLOR}"
+			echo $ECHOFLAGS "${FAILCOLOR}FAIL: $TESTBASENAME - did not get expected error: $EXPECTERROR${NOCOLOR}"
 			EXITCODE=1
 		fi
 	fi