* m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed jikes and

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

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 59c9ada8d65a14d79db1d6ea911e4c123368d687..1f25a604afb787dc01ab81424ccfcbdac0636110 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,21 +17,54 @@
 ##
 ## 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 3697 2005-11-17 18:33:50Z twisti $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+
 
-## Process this file with automake to produce Makefile.in
+SUBDIRS = \
+       assertion \
+       codepatching \
+       jasmin \
+       native
 
 JAVA = $(top_builddir)/src/cacao/cacao
-JAVAC = jikes -classpath $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) -nowarn
+
+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 \
+       $(srcdir)/jctest.java \
+       $(srcdir)/fptest.java \
+       $(srcdir)/fp.java \
+       $(srcdir)/extest.java \
+       $(srcdir)/clinitexception.java \
+       $(srcdir)/LoadDisplacementOverflow.java \
+       $(srcdir)/FieldDisplacementOverflow.java \
+       $(srcdir)/StackDisplacementOverflow.java \
+       $(srcdir)/MinimalClassReflection.java \
+       $(srcdir)/TestAnnotations.java
+
+EXTRA_DIST = \
+       $(SOURCE_FILES) \
+       Test.sh \
+       \
+       jctest.output \
+       fptest.output \
+       fp.output\
+       extest.2output \
+       clinitexception.2output \
+       LoadDisplacementOverflow.output \
+       FieldDisplacementOverflow.output \
+       StackDisplacementOverflow.output \
+       MinimalClassReflection.output \
+       TestAnnotations.output
 
 CLEANFILES = \
        *.class \
@@ -51,19 +82,21 @@ OUTPUT_JAVA_TESTS = \
        clinitexception \
        LoadDisplacementOverflow \
        FieldDisplacementOverflow \
-       StackDisplacementOverflow
+       StackDisplacementOverflow \
+       MinimalClassReflection \
+       TestAnnotations
 
-checkall: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
 
-$(SIMPLE_JAVA_TESTS):
-       @$(JAVAC) -d . $(srcdir)/$@.java
-       @echo -n "$@: "
-       @$(JAVA) $@
+build:
+       @$(JAVACCMD) -d . $(SOURCE_FILES)
 
+$(SIMPLE_JAVA_TESTS):
+       @echo "$@: "
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) $@
 
 $(OUTPUT_JAVA_TESTS):
-       @$(JAVAC) -d . $(srcdir)/$@.java
-       @$(SHELL) $(srcdir)/Test.sh $(JAVA) $@
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD)" $@ $(srcdir)
 
 
 ## Local variables: