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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9223d0493..69f30f145 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,11 +28,11 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 2895 2005-07-04 20:38:29Z christian $
+## $Id: Makefile.am 3057 2005-07-18 22:34:58Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = codepatching kaffe native
+SUBDIRS = codepatching native regression
 
 EXTRA_DIST = \
 	x.java x.output \
@@ -44,26 +44,20 @@ EXTRA_DIST = \
 	BasicToStrings.java BasicToStrings.output \
 	GCBench.java \
 	JavaPerformance.java \
-	param_test.java \
-	perform_tst.sh
+	param_test.java
 
-JAVA = $(top_srcdir)/src/cacao/cacao
-JAVAC = jikes -nowarn 
+JAVA = $(top_builddir)/src/cacao/cacao
+JAVAC = jikes -nowarn
 
 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
 
 %.tst:
 	$(JAVAC) $*.java
 	sh Test.sh $(JAVA) $*
 #	$(JAVA) $* > $*.thisoutput
 #	diff --brief $*.output $*.thisoutput
-	rm -f $*.thisoutput
-	rm -f $*.this2output
-	 
+	$(RM) $*.thisoutput
+	$(RM) $*.this2output
 
 %.tstrun:
 	$(JAVAC) $*.java