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 282440aaa4a07308e05e929a55c5e912b432008b..a68c7f8200431b120a455431d068492ba43dda9e 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/regression/Makefile.am
 ##
-## Copyright (C) 1996-2005 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, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -19,72 +17,75 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-##
-## Contact: cacao@complang.tuwien.ac.at
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 3791 2005-11-23 23:16:29Z twisti $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 
-## Process this file with automake to produce Makefile.in
 
-JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ)
-JAVAC     = jikes -classpath $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) -nowarn
+SUBDIRS = \
+       base \
+       assertion \
+       bugzilla \
+       jasmin \
+       native \
+       resolving
+
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -source 1.5 -target 1.5 -nowarn -bootclasspath $(BOOTCLASSPATH)
+
+SOURCE_FILES = \
+       $(srcdir)/jctest.java \
+       $(srcdir)/fptest.java \
+       $(srcdir)/fp.java \
+       $(srcdir)/extest.java \
+       $(srcdir)/LoadDisplacementOverflow.java \
+       $(srcdir)/FieldDisplacementOverflow.java \
+       $(srcdir)/StackDisplacementOverflow.java \
+       $(srcdir)/MinimalClassReflection.java \
+       $(srcdir)/TestAnnotations.java
 
 EXTRA_DIST = \
+       $(SOURCE_FILES) \
        Test.sh \
-       HelloWorld.java \
-       jctest.java \
+       \
        jctest.output \
-       fptest.java \
-       fptest.output \
-       fp.java \
-       fp.output\
-       extest.java \
-       extest.2output \
-       clinitexception.java \
-       clinitexception.2output \
-       LoadDisplacementOverflow.java \
+       fptest.output.cp \
+       fptest.output.ojdk \
+       fp.output.cp \
+       fp.output.ojdk \
+       extest.2output.cp \
+       extest.2output.ojdk \
        LoadDisplacementOverflow.output \
-       FieldDisplacementOverflow.java \
        FieldDisplacementOverflow.output \
-       StackDisplacementOverflow.java \
-       StackDisplacementOverflow.output
+       StackDisplacementOverflow.output \
+       MinimalClassReflection.output \
+       TestAnnotations.output
 
 CLEANFILES = \
        *.class \
        *.thisoutput
 
-SIMPLE_JAVA_TESTS = \
-       HelloWorld
-
 OUTPUT_JAVA_TESTS = \
        jctest \
        fptest \
        fp \
        extest \
        \
-       clinitexception \
        LoadDisplacementOverflow \
        FieldDisplacementOverflow \
-       StackDisplacementOverflow
+       StackDisplacementOverflow \
+       MinimalClassReflection \
+       TestAnnotations
 
-check: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: build run
 
-$(SIMPLE_JAVA_TESTS):
-       @$(JAVAC) -d . $(srcdir)/$@.java
-       @echo -n "$@: "
-       @$(JAVA) $(JAVAFLAGS) $@
+build:
+       $(JAVACCMD) -d . $(SOURCE_FILES)
 
+run: $(OUTPUT_JAVA_TESTS)
 
 $(OUTPUT_JAVA_TESTS):
-       @$(JAVAC) -d . $(srcdir)/$@.java
-       @$(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD)" $@ $(srcdir)
 
 
 ## Local variables: