* tests/regression/jasmin/Makefile.am: Use JAVACMD as in other test dirs.

* tests/regression/jasmin/runtest: Make JAVACMD work with prepended env vars.

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index 25d689f6b66a17777e05503a2d6a3c22ae6f03c8..a7d384d385ec3bf1d4d1034ee072e771cd3ca2ac 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -1,6 +1,6 @@
 ## tests/regression/jasmin/Makefile.am
 ##
 ## 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.
 ## 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:
        $(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:
 
 
 ## Local variables:

diff --git a/tests/regression/jasmin/runtest b/tests/regression/jasmin/runtest
index 729632210901e918933d292e7d007dfda7020d16..b8a58860de4e8eb5e9a27d3e3d72ad15343b66fe 100755 (executable)
--- a/tests/regression/jasmin/runtest
+++ b/tests/regression/jasmin/runtest
@@ -8,8 +8,8 @@ FAILCOLOR=''
 NOCOLOR=''
 ECHOFLAGS=''
 
 NOCOLOR=''
 ECHOFLAGS=''
 

-if [ -z "$JAVA" ] ; then
-       JAVA=../../../src/cacao/cacao
+if [ -z "$JAVACMD" ] ; then
+       JAVACMD=../../../src/cacao/cacao

 fi
 
 if [ -z "$TIMEOUT" ] ; then
 fi
 
 if [ -z "$TIMEOUT" ] ; then


@@ -44,7 +44,7 @@ if [ "$1" = "--color" ] ; then
        ECHOFLAGS='-e'
 fi
 
        ECHOFLAGS='-e'
 fi
 

-echo "java command: $JAVA $JAVAFLAGS"
+echo "java command: $JAVACMD $JAVAFLAGS"

 
 while [ -n "$1" ]
 do
 
 while [ -n "$1" ]
 do


@@ -72,7 +72,11 @@ do
 
        # run the test
 
 
        # 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
        TESTSTATUS=$?
 
        if [ $TESTSTATUS -ne $EXPECTSTATUS ] ; then


@@ -93,7 +97,7 @@ do
                fi
 
                if [ "$VERBOSE" -eq "1" ] ; then
                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
                        ./show "$TESTLOG"
                fi
        else


@@ -108,7 +112,7 @@ do
        if [ "$CHECKICMD" -ne 0 ] ; then
                rm -f "$TESTSIA"
                touch "$TESTSIA"
        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
 
                cat "$TESTSIA" | sed -n '/^'"$TESTBASENAME"'\.main/,$p' | sed '/^=====.*flags: -1/,$d' | grep "$EXPECTICMD"
        fi