X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=02addaa9ee75287a0bfeca66322513c47500fd34;hb=2f3d2e791a304a437eeecd030a752822fe04ed69;hp=b6454fce4c56d1a3c193ec874bb3fb94cdfc503f;hpb=53eec07125dd80660d6f453ef20a93290898b0e2;p=cacao.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index b6454fce4..02addaa9e 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,7 +1,7 @@
 ## tests/regression/Makefile.am
 ##
 ## Copyright (C) 1996-2005, 2006, 2007, 2008
-## CACAOVM - Verein zu Foerderung der freien virtuellen Machine CACAO
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -22,17 +22,16 @@
 
 
 SUBDIRS = \
-	codepatching \
+	assertion \
+	bugzilla \
 	jasmin \
-	native
+	junit \
+	native \
+	resolving
 
-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
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
 	$(srcdir)/HelloWorld.java \
@@ -40,7 +39,6 @@ SOURCE_FILES = \
 	$(srcdir)/fptest.java \
 	$(srcdir)/fp.java \
 	$(srcdir)/extest.java \
-	$(srcdir)/clinitexception.java \
 	$(srcdir)/LoadDisplacementOverflow.java \
 	$(srcdir)/FieldDisplacementOverflow.java \
 	$(srcdir)/StackDisplacementOverflow.java \
@@ -55,7 +53,6 @@ EXTRA_DIST = \
 	fptest.output \
 	fp.output\
 	extest.2output \
-	clinitexception.2output \
 	LoadDisplacementOverflow.output \
 	FieldDisplacementOverflow.output \
 	StackDisplacementOverflow.output \
@@ -75,7 +72,6 @@ OUTPUT_JAVA_TESTS = \
 	fp \
 	extest \
 	\
-	clinitexception \
 	LoadDisplacementOverflow \
 	FieldDisplacementOverflow \
 	StackDisplacementOverflow \
@@ -85,15 +81,14 @@ OUTPUT_JAVA_TESTS = \
 check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
 
 build:
-	@$(JAVAC) -d . $(SOURCE_FILES)
+	$(JAVACCMD) -d . $(SOURCE_FILES)
 
 $(SIMPLE_JAVA_TESTS):
 	@echo "$@: "
-	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVA) $(JAVAFLAGS) $@
-
+	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) $@
 
 $(OUTPUT_JAVA_TESTS):
-	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
+	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD)" $@ $(srcdir)
 
 
 ## Local variables: