X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2FMakefile.am;h=277918f423c702ee7df7f02d74eef0a42e7e1a33;hb=2196c5059de3b6ad8a0f6220a9cbcb7363cb3b83;hp=9223d049339e4e571dcdffc2c5f1f2fcdf02cd19;hpb=60f2a07f335090f2784b41779b54d46999da472a;p=cacao.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9223d0493..277918f42 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/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, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -19,55 +17,25 @@
 ##
 ## 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 2895 2005-07-04 20:38:29Z christian $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 
-## Process this file with automake to produce Makefile.in
 
-SUBDIRS = codepatching kaffe native
+JAVA     = LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
-EXTRA_DIST = \
-	x.java x.output \
-	jctest.java jctest.output \
-	fptest.java fptest.output \
-	fp.java fp.output \
-	extest.java extest.output extest.2output\
-	TestBase.java TestArrayClasses.java TestArrayClasses.output \
-	BasicToStrings.java BasicToStrings.output \
-	GCBench.java \
-	JavaPerformance.java \
-	param_test.java \
-	perform_tst.sh
-
-JAVA = $(top_srcdir)/src/cacao/cacao
-JAVAC = jikes -nowarn 
+SUBDIRS = \
+	regression
 
-checkall: x.tst jctest.tst fptest.tst fp.tst extest.tst TestArrayClasses.tst BasicToStrings.tst param_test.tst
-	echo "Testing in native/"
-	make -C native checkall
-
-checkrun: GCBench.tstrun JavaPerformance.tstrun
+EXTRA_DIST = \
+	$(srcdir)/*.java
 
-%.tst:
-	$(JAVAC) $*.java
-	sh Test.sh $(JAVA) $*
-#	$(JAVA) $* > $*.thisoutput
-#	diff --brief $*.output $*.thisoutput
-	rm -f $*.thisoutput
-	rm -f $*.this2output
-	 
+CLEANFILES = \
+	*.class
 
-%.tstrun:
-	$(JAVAC) $*.java
-	$(JAVA) $*
+build:
+	$(JAVACCMD) -d . $(srcdir)/*.java
 
 
 ## Local variables: