From 278351edd1277cf80351954f9310e639c5bb8cdd Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Thu, 14 Feb 2008 15:25:23 +0100 Subject: [PATCH] * 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 --- tests/regression/Makefile.am | 12 +++--------- tests/regression/assertion/Makefile.am | 12 +++--------- tests/regression/codepatching/Makefile.am | 12 +++--------- tests/regression/jasmin/Makefile.am | 24 +++++++---------------- tests/regression/native/Makefile.am | 17 ++++++---------- tests/regression/resolving/Makefile.am | 24 +++++++++-------------- 6 files changed, 31 insertions(+), 70 deletions(-) diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am index 752f843de..cf014e4d6 100644 --- 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 16e496986..53a218dd2 100644 --- 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 8ba4acc15..1826e8e1a 100644 --- 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 ffbba1ce0..2221059d0 100644 --- 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 815aa4b1d..83d9e34e3 100644 --- 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 91f45fcfe..eb2350e2f 100644 --- 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) -- 2.25.1