From 2ad677568dae0cd28c95ad0433fbab2cfa61cead Mon Sep 17 00:00:00 2001
From: Stefan Ring <stefan@complang.tuwien.ac.at>
Date: Wed, 22 Feb 2012 19:03:50 +0100
Subject: [PATCH] * tests/regression/jasmin/Makefile.am: Use JAVACMD as in
 other test dirs. * tests/regression/jasmin/runtest: Make JAVACMD work with
 prepended env vars.

---
 tests/regression/jasmin/Makefile.am |  4 ++--
 tests/regression/jasmin/runtest     | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index 25d689f6b..a7d384d38 100644
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -1,6 +1,6 @@
 ## tests/regression/jasmin/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006, 2008
+## Copyright (C) 1996-2012
 ## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
@@ -40,7 +40,7 @@ build:
 	$(JAVACMD) -cp $(JASMIN_JAR) jasmin.Main $(srcdir)/*.j
 
 run:
-	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs JAVA="$(top_builddir)/src/cacao/cacao -Xbootclasspath:$(BOOTCLASSPATH)" $(srcdir)/runtest $(srcdir)/*.j
+	JAVACMD="$(JAVACMD)" $(srcdir)/runtest $(srcdir)/*.j
 
 
 ## Local variables:
diff --git a/tests/regression/jasmin/runtest b/tests/regression/jasmin/runtest
index 729632210..b8a58860d 100755
--- a/tests/regression/jasmin/runtest
+++ b/tests/regression/jasmin/runtest
@@ -8,8 +8,8 @@ FAILCOLOR=''
 NOCOLOR=''
 ECHOFLAGS=''
 
-if [ -z "$JAVA" ] ; then
-	JAVA=../../../src/cacao/cacao
+if [ -z "$JAVACMD" ] ; then
+	JAVACMD=../../../src/cacao/cacao
 fi
 
 if [ -z "$TIMEOUT" ] ; then
@@ -44,7 +44,7 @@ if [ "$1" = "--color" ] ; then
 	ECHOFLAGS='-e'
 fi
 
-echo "java command: $JAVA $JAVAFLAGS"
+echo "java command: $JAVACMD $JAVAFLAGS"
 
 while [ -n "$1" ]
 do
@@ -72,7 +72,11 @@ do
 
 	# run the test
 
-	$TIMEOUTRUN $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
@@ -93,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
@@ -108,7 +112,7 @@ do
 	if [ "$CHECKICMD" -ne 0 ] ; then
 		rm -f "$TESTSIA"
 		touch "$TESTSIA"
-		$JAVA $JAVAFLAGS -sia "$TESTBASENAME" >"$TESTSIA" 2>/dev/null
+		eval $JAVACMD $JAVAFLAGS -sia "$TESTBASENAME" >"$TESTSIA" 2>/dev/null
 		cat "$TESTSIA" | sed -n '/^'"$TESTBASENAME"'\.main/,$p' | sed '/^=====.*flags: -1/,$d' | grep "$EXPECTICMD"
 	fi
 
-- 
2.25.1