* configure.ac (AC_CONFIG_FILES): Re-enabled resolving since Edwin

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

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index e2bbd45db395556001b5ae9da1d483c9e79a2e37..752f843de5d8e929ffc8123f2141d64e66573bc3 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/regression/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, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,23 +19,25 @@
 ## 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
-##
-## Changes:
-##
-## $Id: Makefile.am 5404 2006-09-07 13:29:05Z christian $
 
-## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
+       assertion \
        codepatching \
-       native
+       jasmin \
+       native \
+       resolving
 
-JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
+JAVA = $(top_builddir)/src/cacao/cacao
+
+if WITH_CLASSPATH_GNU
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
+else
+BOOTCLASSPATH = $(CLASSPATH_CLASSES)
+endif
+
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        $(srcdir)/HelloWorld.java \
@@ -45,11 +45,12 @@ SOURCE_FILES = \
        $(srcdir)/fptest.java \
        $(srcdir)/fp.java \
        $(srcdir)/extest.java \
-       $(srcdir)/extest_clinit.java \
        $(srcdir)/clinitexception.java \
        $(srcdir)/LoadDisplacementOverflow.java \
        $(srcdir)/FieldDisplacementOverflow.java \
-       $(srcdir)/StackDisplacementOverflow.java
+       $(srcdir)/StackDisplacementOverflow.java \
+       $(srcdir)/MinimalClassReflection.java \
+       $(srcdir)/TestAnnotations.java
 
 EXTRA_DIST = \
        $(SOURCE_FILES) \
@@ -62,7 +63,9 @@ EXTRA_DIST = \
        clinitexception.2output \
        LoadDisplacementOverflow.output \
        FieldDisplacementOverflow.output \
-       StackDisplacementOverflow.output
+       StackDisplacementOverflow.output \
+       MinimalClassReflection.output \
+       TestAnnotations.output
 
 CLEANFILES = \
        *.class \
@@ -80,20 +83,21 @@ OUTPUT_JAVA_TESTS = \
        clinitexception \
        LoadDisplacementOverflow \
        FieldDisplacementOverflow \
-       StackDisplacementOverflow
+       StackDisplacementOverflow \
+       MinimalClassReflection \
+       TestAnnotations
 
 check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
 
 build:
-       @$(JAVAC) -d . $(SOURCE_FILES)
+       @$(JAVACCMD) -d . $(SOURCE_FILES)
 
 $(SIMPLE_JAVA_TESTS):
-       @echo -nowarn -n "$@: "
-       @$(JAVA) $(JAVAFLAGS) $@
-
+       @echo "$@: "
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) $@
 
 $(OUTPUT_JAVA_TESTS):
-       @$(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD)" $@ $(srcdir)
 
 
 ## Local variables: