* 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 bf4006908291056ce17ae847974b56c5f9668a44..00078c7b360feb1398df35c3a75ff33aa940ceae 100644 (file)
--- 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 da36c51435ec21e0934977bf51b7b53af2d05352..341de56a2c95f770e5f18cb27d4e1855f6ea9d9c 100755 (executable)
--- 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