* CLASSPATH_INSTALL_DIR: Renamed to CLASSPATH_PREFIX.

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

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index b08135b9319ced8022598848d47a5cc4a41c42a2..ae2d902d0b856e9047aa104f19e0aa7c32582215 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -28,12 +28,32 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
+## $Id: Makefile.am 4218 2006-01-17 16:55:21Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-JAVA = $(top_builddir)/src/cacao/cacao
-JAVAC = jikes -classpath $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) -nowarn
+JAVA      = $(top_builddir)/src/cacao/cacao
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
+
+EXTRA_DIST = \
+       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 \
+       LoadDisplacementOverflow.output \
+       FieldDisplacementOverflow.java \
+       FieldDisplacementOverflow.output \
+       StackDisplacementOverflow.java \
+       StackDisplacementOverflow.output
 
 CLEANFILES = \
        *.class \
@@ -53,17 +73,17 @@ OUTPUT_JAVA_TESTS = \
        FieldDisplacementOverflow \
        StackDisplacementOverflow
 
-checkall: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
 
 $(SIMPLE_JAVA_TESTS):
-       @$(JAVAC) $@.java
+       @$(JAVAC) -d . $(srcdir)/$@.java
        @echo -n "$@: "
-       @$(JAVA) $@
+       @$(JAVA) $(JAVAFLAGS) $@
 
 
 $(OUTPUT_JAVA_TESTS):
-       @$(JAVAC) $@.java
-       @$(SHELL) Test.sh $(JAVA) $@
+       @$(JAVAC) -d . $(srcdir)/$@.java
+       @$(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
 
 
 ## Local variables: