Add new test output reference files to EXTRA_DIST.

[cacao.git] / tests / regression / Makefile.am

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index b6454fce4c56d1a3c193ec874bb3fb94cdfc503f..a68c7f8200431b120a455431d068492ba43dda9e 100644 (file)
--- 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,25 +22,22 @@
 
 
 SUBDIRS = \
-       codepatching \
+       base \
+       assertion \
+       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 \
@@ -52,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 \
@@ -66,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: