* tests/regression/Makefile.am: Always use the same bootclasspath for

different configurations, it does not matter.

* tests/regression/assertion/Makefile.am,
tests/regression/codepatching/Makefile.am,
tests/regression/jasmin/Makefile.am,
tests/regression/native/Makefile.am,
tests/regression/resolving/Makefile.am: Likewise

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 752f843de5d8e929ffc8123f2141d64e66573bc3..cf014e4d60358b5fc0eda7b5f851a31fb8f868e0 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -28,16 +28,10 @@ SUBDIRS = \
        native \
        resolving
 
-JAVA = $(top_builddir)/src/cacao/cacao
-
-if WITH_CLASSPATH_GNU
+JAVA          = $(top_builddir)/src/cacao/cacao
 BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-else
-BOOTCLASSPATH = $(CLASSPATH_CLASSES)
-endif
-
-JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        $(srcdir)/HelloWorld.java \

diff --git a/tests/regression/assertion/Makefile.am b/tests/regression/assertion/Makefile.am
index 16e496986b8fd48062b67457a45e321e8d6628ae..53a218dd2f3bef327c83ce4bb9c3fcbe585d0bfe 100644 (file)
--- a/tests/regression/assertion/Makefile.am
+++ b/tests/regression/assertion/Makefile.am
@@ -21,16 +21,10 @@
 ## 02110-1301, USA.
 
 
-JAVA = $(top_builddir)/src/cacao/cacao
-
-if WITH_CLASSPATH_GNU
+JAVA          = $(top_builddir)/src/cacao/cacao
 BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-else
-BOOTCLASSPATH = $(CLASSPATH_CLASSES)
-endif
-
-JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        $(srcdir)/testassertions.java \

diff --git a/tests/regression/codepatching/Makefile.am b/tests/regression/codepatching/Makefile.am
index 8ba4acc15e8c2bc91c602f933130a947d161043d..1826e8e1aab84fd889f195f7045d361c1fef20b9 100644 (file)
--- a/tests/regression/codepatching/Makefile.am
+++ b/tests/regression/codepatching/Makefile.am
@@ -21,16 +21,10 @@
 ## 02110-1301, USA.
 
 
-JAVA = $(top_builddir)/src/cacao/cacao
-
-if WITH_CLASSPATH_GNU
+JAVA          = $(top_builddir)/src/cacao/cacao
 BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-else
-BOOTCLASSPATH = $(CLASSPATH_CLASSES)
-endif
-
-JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        $(srcdir)/aastoreconstClass.java \

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index ffbba1ce031308c45fc1dd167df300a99f665586..2221059d083538308bddfcc270393456415ffa52 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/regression/jasmin/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
+## Copyright (C) 1996-2005, 2006, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,20 +19,12 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##          Edwin Steiner
-## Process this file with automake to produce Makefile.in
 
-JAVA      = $(top_builddir)/src/cacao/cacao
 
-if WITH_CLASSPATH_GNU
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
-else
-JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
-endif
+JAVA          = $(top_builddir)/src/cacao/cacao
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
+JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 JASMIN_TESTS = \
        $(srcdir)/test_coalesce_simple_store.j \
@@ -140,7 +130,7 @@ CLEANFILES = \
        TESTLOG TESTEXPECT TESTOUT TESTERR TESTSIA
 
 check:
-       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs JAVA="$(JAVA)" JAVAFLAGS="$(JAVAFLAGS)" $(srcdir)/runtest $(JASMIN_TESTS)
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs JAVA="$(JAVACMD)" $(srcdir)/runtest $(JASMIN_TESTS)
 
 ## Local variables:
 ## mode: Makefile

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index 815aa4b1d8fab1157492fda59e66013118433a9d..83d9e34e350567a1e603a7d3ed0ecadd1136db05 100644 (file)
--- a/tests/regression/native/Makefile.am
+++ b/tests/regression/native/Makefile.am
@@ -23,17 +23,12 @@
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)
 
-JAVA  = $(top_builddir)/src/cacao/cacao
-JAVAH = $(CACAOH)
-
-if WITH_CLASSPATH_GNU
+JAVA          = $(top_builddir)/src/cacao/cacao
+JAVAH         = $(CACAOH)
 BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-else
-BOOTCLASSPATH = $(CLASSPATH_CLASSES)
-endif
-
-JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVAHCMD      = $(JAVAH) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        checkjni.java \
@@ -65,7 +60,7 @@ check: $(TESTNAMES)
 
 $(TESTNAMES) $(NOTESTNAMES):
        @$(JAVACCMD) -d . $(srcdir)/$@.java
-       @$(JAVAH) -bootclasspath $(BOOTCLASSPATH) $@
+       @$(JAVAHCMD) $@
        @$(CC) -shared $(AM_CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC
        @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs:. $(SHELL) $(srcdir)/../Test.sh "$(JAVACMD)" $@ $(srcdir)
 

diff --git a/tests/regression/resolving/Makefile.am b/tests/regression/resolving/Makefile.am
index 91f45fcfeaa1c88eb1a6cd4006fd5a0312f6ae0d..eb2350e2fe4b8079505c9c48cb6aee31ce123e3e 100644 (file)
--- a/tests/regression/resolving/Makefile.am
+++ b/tests/regression/resolving/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/regression/resolving/Makefile.am
 ##
-## Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
+## Copyright (C) 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -28,6 +26,11 @@ SUBDIRS = \
        classes2 \
        classes3
 
+JAVA          = $(top_builddir)/src/cacao/cacao
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
+JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+
 HARNESS_SOURCE_FILES = \
        $(srcdir)/TestController.java \
        $(srcdir)/TestLoader.java
@@ -61,17 +64,8 @@ EXTRA_DIST = $(HARNESS_SOURCE_FILES) $(TEST_SOURCE_FILES)
 CLEANFILES = \
        *.class
 
-JAVA      = $(top_builddir)/src/cacao/cacao
-
-if WITH_CLASSPATH_GNU
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
-else
-JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
-endif
-
 check: $(HARNESS_CLASS_FILES)
-       @for t in $(TEST_NAMES) ; do echo "TEST $$t" ; { $(JAVAC) -d . -classpath . $(srcdir)/$$t.java && LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVA) $(JAVAFLAGS) $$t ; } || exit 1 ; done
+       @for t in $(TEST_NAMES) ; do echo "TEST $$t" ; { $(JAVACCMD) -d . -classpath . $(srcdir)/$$t.java && LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) $$t ; } || exit 1 ; done
 
 $(HARNESS_CLASS_FILES): $(HARNESS_SOURCE_FILES)
-       $(JAVAC) -d . $(HARNESS_SOURCE_FILES)
-
+       $(JAVACCMD) -d . $(HARNESS_SOURCE_FILES)