Merge -> trunk.

[cacao.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e34e8b19531fda381b70d7326ea61d00e6b45d1e..f5ff483c20ceeb27ec2e454ee3ff0b9d0f377ebc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,23 +1,73 @@
-SUBDIRS = kaffe
+## tests/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
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+##
+## Contact: cacao@cacaojvm.org
+##
+## Authors: Christian Thalinger
+##
+## Changes:
 
-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 \
-       GCBench.java
+## Process this file with automake to produce Makefile.in
 
-check_DATA = checkall
+SUBDIRS = regression
 
-checkall: x.tst jctest.tst TestArrayClasses.tst BasicToStrings.tst fp.tst fptest.tst GCBench.tstrun
+EXTRA_DIST = \
+       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
+
+JAVA = $(top_builddir)/src/cacao/cacao
+
+checkall: x.tst TestArrayClasses.tst BasicToStrings.tst param_test.tst exception_restore_registers.tst
 
 %.tst:
-       ../cacao -classpath . -log /dev/null sun.tools.javac.Main $*.java
-       ../cacao -classpath . -log /dev/null $* >$*.thisoutput
-       diff --brief $*.output $*.thisoutput
-       rm -f $*.thisoutput
+       $(JAVAC) $*.java
+       sh Test.sh $(JAVA) $*
+#      $(JAVA) $* > $*.thisoutput
+#      diff --brief $*.output $*.thisoutput
+       $(RM) $*.thisoutput
+       $(RM) $*.this2output
 
 %.tstrun:
-       ../cacao -classpath . -log /dev/null sun.tools.javac.Main $*.java
-       ../cacao -classpath . -log /dev/null $*
+       $(JAVAC) $*.java
+       $(JAVA) $*
+
+
+## Local variables:
+## mode: Makefile
+## indent-tabs-mode: t
+## c-basic-offset: 4
+## tab-width: 8
+## compile-command: "automake --add-missing"
+## End: