X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2Fregression%2Fjasmin%2Fruntest;h=b8a58860de4e8eb5e9a27d3e3d72ad15343b66fe;hb=2ad677568dae0cd28c95ad0433fbab2cfa61cead;hp=746f73906941ab7835b3b3463489ec9ee1c00693;hpb=dd3eddee574bc174458f55001b5d93a19ba4707c;p=cacao.git

diff --git a/tests/regression/jasmin/runtest b/tests/regression/jasmin/runtest
index 746f73906..b8a58860d 100755
--- a/tests/regression/jasmin/runtest
+++ b/tests/regression/jasmin/runtest
@@ -8,8 +8,26 @@ FAILCOLOR=''
 NOCOLOR=''
 ECHOFLAGS=''
 
-if [ -z "$JAVA" ] ; then
-	JAVA=../../../src/cacao/cacao
+if [ -z "$JAVACMD" ] ; then
+	JAVACMD=../../../src/cacao/cacao
+fi
+
+if [ -z "$TIMEOUT" ] ; then
+	TIMEOUT=20
+fi
+
+if [ -n "$TIMEOUTPROG" ] ; then
+	if [ -x "$TIMEOUTPROG" ] ; then
+		echo "$0: using timeout program: $TIMEOUTPROG"
+		echo "$0: timeout value [s]    : $TIMEOUT"
+		TIMEOUTRUN="$TIMEOUTPROG $TIMEOUT"
+	else
+		echo >&2 "$0: warning: timeout program not executable: $TIMEOUTPROG"
+	fi
+fi
+
+if [ -z "$TIMEOUTRUN" ] ; then
+	echo >&2 "$0: warning: running without timeout"
 fi
 
 if [ "$1" = "--verbose" ] ; then
@@ -26,19 +44,7 @@ if [ "$1" = "--color" ] ; then
 	ECHOFLAGS='-e'
 fi
 
-if [ -z "$JASMIN_JAR" ] ; then
-	JASMIN_JAR=/usr/share/java/jasmin-sable.jar
-fi
-
-if [ ! -r "$JASMIN_JAR" ] ; then
-	echo >&2 "$0: warning: jasmin .jar is not available at $JASMIN_JAR"
-	exit 0
-fi
-
-JASMIN="$JAVA $JAVAFLAGS -cp $JASMIN_JAR jasmin.Main"
-
-echo "java command: $JAVA $JAVAFLAGS"
-echo "jasmin command: $JASMIN"
+echo "java command: $JAVACMD $JAVAFLAGS"
 
 while [ -n "$1" ]
 do
@@ -49,21 +55,28 @@ do
     TESTEXPECT="TESTEXPECT"
     TESTLOG="TESTLOG"
     TESTERR="TESTERR"
+	TESTSIA="TESTSIA"
 
 	EXPECTSTATUS=0
-
-	# compile the test
-
-    $JASMIN "$TEST" || exit 2
+	CHECKICMD=0
 
 	if grep 'ERROR:' "$TEST" >/dev/null ; then
 		EXPECTSTATUS=1
 		EXPECTERROR=$(grep 'ERROR:.*' "$TEST" | sed 's,.*ERROR:[ \t]*,,')
 	fi
 
+	if grep 'ICMD:' "$TEST" >/dev/null ; then
+		CHECKICMD=1
+		EXPECTICMD=$(grep 'ICMD:.*' "$TEST" | sed 's,.*ICMD:[ \t]*,,')
+	fi
+
 	# run the test
 
-    $JAVA $JAVAFLAGS "$TESTBASENAME" >"$TESTOUT" 2>"$TESTERR"
+	if [ -z "$TIMEOUTRUN" ] ; then
+		eval $JAVACMD $JAVAFLAGS "$TESTBASENAME" >"$TESTOUT" 2>"$TESTERR"
+	else
+		$TIMEOUTRUN $JAVACMD $JAVAFLAGS "$TESTBASENAME" >"$TESTOUT" 2>"$TESTERR"
+	fi
 	TESTSTATUS=$?
 
 	if [ $TESTSTATUS -ne $EXPECTSTATUS ] ; then
@@ -84,7 +97,7 @@ do
 		fi
 
 		if [ "$VERBOSE" -eq "1" ] ; then
-			$JAVA $JAVAFLAGS -sia "$TESTBASENAME" >"$TESTLOG" || exit 2
+			eval $JAVACMD $JAVAFLAGS -sia "$TESTBASENAME" >"$TESTLOG" || exit 2
 			./show "$TESTLOG"
 		fi
 	else
@@ -96,6 +109,13 @@ do
 		fi
 	fi
 
+	if [ "$CHECKICMD" -ne 0 ] ; then
+		rm -f "$TESTSIA"
+		touch "$TESTSIA"
+		eval $JAVACMD $JAVAFLAGS -sia "$TESTBASENAME" >"$TESTSIA" 2>/dev/null
+		cat "$TESTSIA" | sed -n '/^'"$TESTBASENAME"'\.main/,$p' | sed '/^=====.*flags: -1/,$d' | grep "$EXPECTICMD"
+	fi
+
     shift
 done