[kaffe] [jeroen at haydn.debian.org: CVS kaffe/debian]

[Jeroen van Wolffelaar]

Log Message:
* SIGKILL kaffe in testsuite when SIGTERM doesn't work, prevent timeouts
  during build.

--Jeroen

diff -ur kaffe-1.1.5.orig/test/regression/TestScript.in kaffe-1.1.5/test/regression/TestScript.in
--- kaffe-1.1.5.orig/test/regression/TestScript.in	2005-04-05 19:51:51.000000000 +0200
+++ kaffe-1.1.5/test/regression/TestScript.in	2005-04-20 14:48:53.000000000 +0200
@@ -19,6 +19,7 @@
 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}
+: ${HARDTIMEOUT=5}
 overallerror=0
 error=0
 
@@ -76,7 +77,7 @@
 	error=$?
 	pid=$!
 	$VERBOSE "Background pid: $pid"
-	(sleep $TIMEOUT; echo "Timeout - $TIMEOUT seconds - killed" >> $TMPRESULT; kill $pid) &
+	(sleep $TIMEOUT; echo "Timeout - $TIMEOUT seconds - killed" >> $TMPRESULT; kill $pid; sleep $HARDTIMEOUT; echo "Still alive $HARDTIMEOUT seconds after SIGTERM - SIGKILL sent)" >> $TMPRESULT; kill -KILL $pid) &
 	killerpid=$!
 	$VERBOSE "Killer process pid: $killerpid with timeout of $TIMEOUT seconds"
 	wait $pid

-- 
Jeroen van Wolffelaar
Jeroen at wolffelaar.nl (also for Jabber & MSN; ICQ: 33944357)
http://Jeroen.A-Eskwadraat.nl