X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=1481cac0bbb04c5f1a577c87fb544c79a10d9cd2;hb=70bd214ee92d267a4bcfb4dbe2dc6e8e0d2c6a51;hp=03016384062d19a39cf05d3cae5b67f50591bed1;hpb=fae07d94d5fda08a72606b7d9d95c1abac3bd84f;p=cacao.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 030163840..1481cac0b 100644
--- 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,75 +17,72 @@
 ##
 ## 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 4330 2006-01-20 13:41:51Z twisti $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+
 
-## Process this file with automake to produce Makefile.in
+SUBDIRS = \
+	assertion \
+	bugzilla \
+	jasmin \
+	junit \
+	native \
+	resolving
 
-SUBDIRS = codepatching
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -source 1.5 -target 1.5 -nowarn -bootclasspath $(BOOTCLASSPATH)
 
-JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
+SOURCE_FILES = \
+	$(srcdir)/jctest.java \
+	$(srcdir)/fptest.java \
+	$(srcdir)/fp.java \
+	$(srcdir)/extest.java \
+	$(srcdir)/LoadDisplacementOverflow.java \
+	$(srcdir)/FieldDisplacementOverflow.java \
+	$(srcdir)/StackDisplacementOverflow.java \
+	$(srcdir)/MinimalClassReflection.java \
+	$(srcdir)/TestAnnotations.java
 
 EXTRA_DIST = \
+	$(SOURCE_FILES) \
 	Test.sh \
-	HelloWorld.java \
-	jctest.java \
-	fptest.java \
-	fp.java \
-	extest.java \
-	extest_clinit.java \
-	clinitexception.java \
-	LoadDisplacementOverflow.java \
-	FieldDisplacementOverflow.java \
-	StackDisplacementOverflow.java \
 	\
 	jctest.output \
 	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: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: build run
 
-$(SIMPLE_JAVA_TESTS):
-	@$(JAVAC) -d . $(srcdir)/$@.java
-	@echo -n "$@: "
-	@$(JAVA) $(JAVAFLAGS) $@
+build:
+	$(JAVACCMD) -d . $(SOURCE_FILES)
 
+run: $(OUTPUT_JAVA_TESTS)
 
 $(OUTPUT_JAVA_TESTS):
-	@$(JAVAC) -d . $(srcdir)/$@.java
-	@$(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
+	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD)" $@ $(srcdir)
 
 
 ## Local variables: