X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=3f58045eedcb0f4c4994aa60dbe5ea555cba543f;hb=8ef6ac71d23a3151c1e6cd6bf535ccd85e095c32;hp=3ceb21b0de9a9d5d108946492bc433736b8569b9;hpb=7cac8dec57ed530d66de9e64807ffb9f5102aacd;p=cacao.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 3ceb21b0d..3f58045ee 100644
--- 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,36 +19,30 @@
 ## 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 5610 2006-10-01 20:27:54Z edwin $
 
-## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
-	codepatching \
+	base \
+	assertion \
+	bugzilla \
 	jasmin \
-	native
+	native \
+	resolving
 
-JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -source 1.5 -target 1.5 -nowarn -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
-	$(srcdir)/HelloWorld.java \
 	$(srcdir)/jctest.java \
 	$(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) \
@@ -60,41 +52,37 @@ EXTRA_DIST = \
 	fptest.output \
 	fp.output\
 	extest.2output \
-	clinitexception.2output \
 	LoadDisplacementOverflow.output \
 	FieldDisplacementOverflow.output \
-	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: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: build run
 
 build:
-	@$(JAVAC) -d . $(SOURCE_FILES)
-
-$(SIMPLE_JAVA_TESTS):
-	@echo -nowarn -n "$@: "
-	@$(JAVA) $(JAVAFLAGS) $@
+	$(JAVACCMD) -d . $(SOURCE_FILES)
 
+run: $(OUTPUT_JAVA_TESTS)
 
 $(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: