X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2FMakefile.am;h=f5ff483c20ceeb27ec2e454ee3ff0b9d0f377ebc;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=42559982b84b82979e248cefeafb45abc66e1c7a;hpb=d75b6037acf17c342166b9c9bd6e657dfdd12cd9;p=cacao.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 42559982b..f5ff483c2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,9 @@
 ## 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 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
 ##
 ## This file is part of CACAO.
 ##
@@ -19,43 +19,45 @@
 ##
 ## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 ##
-## Contact: cacao@complang.tuwien.ac.at
+## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
 ##
 ## Changes:
-##
-## $Id: Makefile.am 1735 2004-12-07 14:33:27Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = jvm98 kaffe
+SUBDIRS = regression
 
 EXTRA_DIST = \
-	x.java x.output \
-	jctest.java jctest.output \
-	fp.java fp.output \
-	fptest.java fptest.output \
-	TestBase.java TestArrayClasses.java TestArrayClasses.output \
-	BasicToStrings.java BasicToStrings.output \
-	extest.java extest_clinit.java extest.output \
-	GCBench.java
-
-JAVA = $(top_srcdir)/src/cacao/cacao
-JAVAC = jikes -nowarn
+	hello.java \
+	prop.java \
+	x.java \
+	x.output \
+	TestBase.java \
+	TestArrayClasses.java \
+	TestArrayClasses.output \
+	BasicToStrings.java \
+	BasicToStrings.output \
+	GCBench.java \
+	JavaPerformance.java \
+	param_test.java \
+	exception_restore_registers.java
 
-check_DATA = checkall
+JAVA = $(top_builddir)/src/cacao/cacao
 
-checkall: x.tst jctest.tst TestArrayClasses.tst BasicToStrings.tst fp.tst fptest.tst extest.tst GCBench.tstrun
+checkall: x.tst TestArrayClasses.tst BasicToStrings.tst param_test.tst exception_restore_registers.tst
 
 %.tst:
 	$(JAVAC) $*.java
-	$(JAVA) $* > $*.thisoutput
-	diff --brief $*.output $*.thisoutput
-	rm -f $*.thisoutput
+	sh Test.sh $(JAVA) $*
+#	$(JAVA) $* > $*.thisoutput
+#	diff --brief $*.output $*.thisoutput
+	$(RM) $*.thisoutput
+	$(RM) $*.this2output
 
 %.tstrun:
 	$(JAVAC) $*.java