* tests/regression/jasmin/runtest: Improved harness script.

--HG--
branch : new_instruction_format

diff --git a/tests/regression/jasmin/runtest b/tests/regression/jasmin/runtest
index e3e0c3f18adaf260c15299b8ea676b31d4f83c52..cd1a1d8c0786f680b261a2e5ad3fbc3427c3ff68 100755 (executable)
--- a/tests/regression/jasmin/runtest
+++ b/tests/regression/jasmin/runtest
@@ -3,11 +3,18 @@
 VERBOSE=0
 EXITCODE=0
 
+if [ -z "$JAVA" ] ; then
+       JAVA=../../../src/cacao/cacao
+fi
+
 if [ "$1" = "--verbose" ] ; then
        shift
        VERBOSE=1
 fi
 
+JASMIN_JAR=/usr/share/java/jasmin-sable.jar
+JASMIN="$JAVA -cp $JASMIN_JAR jasmin.Main"
+
 while [ -n "$1" ]
 do
     TEST="$1"
@@ -17,8 +24,8 @@ do
     TESTEXPECT="TESTEXPECT"
     TESTLOG="TESTLOG"
 
-    jasmin "$TEST" || exit 2
-    cacao "$TESTBASENAME" >"$TESTOUT" || exit 2
+    $JASMIN "$TEST" || exit 2
+    $JAVA "$TESTBASENAME" >"$TESTOUT" || exit 2
 
     grep 'OUTPUT:' "$TEST" | sed 's,.*OUTPUT:\s*,,' >"$TESTEXPECT"
 
@@ -30,7 +37,7 @@ do
     fi
 
     if [ "$VERBOSE" -eq "1" ] ; then
-       cacao -sia "$TESTBASENAME" >"$TESTLOG" || exit 2
+       $JAVA -sia "$TESTBASENAME" >"$TESTLOG" || exit 2
        ./show "$TESTLOG"
     fi
 
@@ -40,3 +47,4 @@ done
 #rm -f "$TESTOUT" "$TESTEXPECT" "$TESTLOG"
 
 exit $EXITCODE
+