[kaffe] CVS kaffe (robilad): Use jikes for regression tests as well

[Kaffe CVS]

PatchSet 5877 
Date: 2005/01/20 21:38:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Use jikes for regression tests as well

2005-01-20  Dalibor Topic  <robilad at kaffe.org>

* test/regression/TestScript.in,
Makefile.am (BUILD_ENVIRONMENT-make): Removed JAVAX_CRYPTO_JAR.

* test/regression/TestScript.in: Use jikes for regression tests as well.

Members: 
	ChangeLog:1.3418->1.3419 
	Makefile.am:1.84->1.85 
	Makefile.in:1.194->1.195 
	test/regression/TestScript.in:1.45->1.46 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3418 kaffe/ChangeLog:1.3419
--- kaffe/ChangeLog:1.3418	Thu Jan 20 20:56:23 2005
+++ kaffe/ChangeLog	Thu Jan 20 21:38:05 2005
@@ -1,5 +1,12 @@
 2005-01-20  Dalibor Topic  <robilad at kaffe.org>
 
+	* test/regression/TestScript.in, 
+	Makefile.am (BUILD_ENVIRONMENT-make): Removed JAVAX_CRYPTO_JAR.	
+
+	* test/regression/TestScript.in: Use jikes for regression tests as well.
+	
+2005-01-20  Dalibor Topic  <robilad at kaffe.org>
+
 	* FAQ/FAQ.classlibrary-compile: Changed recommended version of jikes 
 	to jikes 1.21.
 
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.84 kaffe/Makefile.am:1.85
--- kaffe/Makefile.am:1.84	Thu Jan 20 20:56:25 2005
+++ kaffe/Makefile.am	Thu Jan 20 21:38:09 2005
@@ -135,7 +135,7 @@
 		"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
 
 BUILD_ENVIRONMENT-make: Makefile
-	echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
+	echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
 	echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
 	echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
 	echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.194 kaffe/Makefile.in:1.195
--- kaffe/Makefile.in:1.194	Thu Jan 20 20:56:25 2005
+++ kaffe/Makefile.in	Thu Jan 20 21:38:11 2005
@@ -971,7 +971,7 @@
 		"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
 
 BUILD_ENVIRONMENT-make: Makefile
-	echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
+	echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
 	echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
 	echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
 	echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \
Index: kaffe/test/regression/TestScript.in
diff -u kaffe/test/regression/TestScript.in:1.45 kaffe/test/regression/TestScript.in:1.46
--- kaffe/test/regression/TestScript.in:1.45	Tue Oct  5 01:02:39 2004
+++ kaffe/test/regression/TestScript.in	Thu Jan 20 21:38:12 2005
@@ -16,8 +16,8 @@
 : ${JAVA=$KAFFEHOME/bin/kaffe} ${SRCDIR=@srcdir@} ${PATHSEP='@PATHSEP@'}
 : ${JASMIN=@JASMIN@}
 # If you want to use jikes as default compiler for the regression tests uncomment the line below.
-#test -z "@JIKES@" || : ${JIKES="@JIKES@ -nowarn -bootclasspath @JAVAX_CRYPTO_JAR@"}
-: ${JAVAC=${JIKES-"$JAVA -ss 512k -noverify at.dms.kjc.Main"}" -classpath \".${PATHSEP}@JAVAX_CRYPTO_JAR@${PATHSEP}@GNU_CRYPTO_JAR@${PATHSEP}@JAVAX_SECURITY_JAR@${PATHSEP}${SRCDIR}${PATHSEP}compile_time${PATHSEP}${CLASSPATH}\""}
+test -z "@JIKES@" || : ${JIKES="@JIKES@ -nowarn -bootclasspath @top_builddir@/libraries/javalib/rt.jar"}
+: ${JAVAC=${JIKES-"$JAVA -ss 512k -noverify at.dms.kjc.Main"}" -classpath \".${PATHSEP}@GNU_CRYPTO_JAR@${PATHSEP}@JAVAX_SECURITY_JAR@${PATHSEP}${SRCDIR}${PATHSEP}compile_time${PATHSEP}${CLASSPATH}\""}
 : ${TIMEOUT=300}
 overallerror=0
 error=0