* Removed all Id tags.

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

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 3ceb21b0de9a9d5d108946492bc433736b8569b9..a205dc10d1eaef39caa796629dd3573a8f727436 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -25,20 +25,21 @@
 ## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 5610 2006-10-01 20:27:54Z edwin $
 
-## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
        codepatching \
        jasmin \
-       native
+       native \
+       resolving
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
+
+if WITH_CLASSPATH_GNU
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+else
+JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+endif
 
 SOURCE_FILES = \
        $(srcdir)/HelloWorld.java \
@@ -50,7 +51,9 @@ SOURCE_FILES = \
        $(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) \
@@ -63,7 +66,9 @@ EXTRA_DIST = \
        clinitexception.2output \
        LoadDisplacementOverflow.output \
        FieldDisplacementOverflow.output \
-       StackDisplacementOverflow.output
+       StackDisplacementOverflow.output \
+       MinimalClassReflection.output \
+       TestAnnotations.output
 
 CLEANFILES = \
        *.class \
@@ -81,7 +86,9 @@ OUTPUT_JAVA_TESTS = \
        clinitexception \
        LoadDisplacementOverflow \
        FieldDisplacementOverflow \
-       StackDisplacementOverflow
+       StackDisplacementOverflow \
+       MinimalClassReflection \
+       TestAnnotations
 
 check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
 
@@ -89,12 +96,12 @@ build:
        @$(JAVAC) -d . $(SOURCE_FILES)
 
 $(SIMPLE_JAVA_TESTS):
-       @echo -nowarn -n "$@: "
-       @$(JAVA) $(JAVAFLAGS) $@
+       @echo "$@: "
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVA) $(JAVAFLAGS) $@
 
 
 $(OUTPUT_JAVA_TESTS):
-       @$(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
 
 
 ## Local variables: