X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=a68c7f8200431b120a455431d068492ba43dda9e;hb=2a1e7f93fdfea2868c013873da59fc44ca2b972e;hp=7b6a8b505263eb3627be3020e38273456524b252;hpb=802ce8af05f0d14f8555e266031e574695721dc1;p=cacao.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 7b6a8b505..a68c7f820 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -22,26 +22,22 @@
 
 
 SUBDIRS = \
+	base \
 	assertion \
-	codepatching \
+	bugzilla \
 	jasmin \
-	native
+	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) -source 1.5 -target 1.5 -nowarn -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
-	$(srcdir)/HelloWorld.java \
 	$(srcdir)/jctest.java \
 	$(srcdir)/fptest.java \
 	$(srcdir)/fp.java \
 	$(srcdir)/extest.java \
-	$(srcdir)/clinitexception.java \
 	$(srcdir)/LoadDisplacementOverflow.java \
 	$(srcdir)/FieldDisplacementOverflow.java \
 	$(srcdir)/StackDisplacementOverflow.java \
@@ -53,10 +49,12 @@ EXTRA_DIST = \
 	Test.sh \
 	\
 	jctest.output \
-	fptest.output \
-	fp.output\
-	extest.2output \
-	clinitexception.2output \
+	fptest.output.cp \
+	fptest.output.ojdk \
+	fp.output.cp \
+	fp.output.ojdk \
+	extest.2output.cp \
+	extest.2output.ojdk \
 	LoadDisplacementOverflow.output \
 	FieldDisplacementOverflow.output \
 	StackDisplacementOverflow.output \
@@ -67,34 +65,27 @@ CLEANFILES = \
 	*.class \
 	*.thisoutput
 
-SIMPLE_JAVA_TESTS = \
-	HelloWorld
-
 OUTPUT_JAVA_TESTS = \
 	jctest \
 	fptest \
 	fp \
 	extest \
 	\
-	clinitexception \
 	LoadDisplacementOverflow \
 	FieldDisplacementOverflow \
 	StackDisplacementOverflow \
 	MinimalClassReflection \
 	TestAnnotations
 
-check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: build run
 
 build:
-	@$(JAVAC) -d . $(SOURCE_FILES)
-
-$(SIMPLE_JAVA_TESTS):
-	@echo "$@: "
-	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVA) $(JAVAFLAGS) $@
+	$(JAVACCMD) -d . $(SOURCE_FILES)
 
+run: $(OUTPUT_JAVA_TESTS)
 
 $(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: