libgo/testsuite: another fix for killing the sleep process

Avoid ps padding issues.  Make sure we locate and kill just the sleep
process.

Change-Id: Ib92d7e1afafadd8492e6e7bd733fe96013abc214
Reviewed-on: https://go-review.googlesource.com/13634
Reviewed-by: Andrew Wilkins <[email protected]>
Reviewed-by: Ian Lance Taylor <[email protected]>

Author: ianlancetaylor

libgo/testsuite/gotest

@@ -504,6 +504,7 @@ xno)
 	fi
 	${GL} *.o ${GOLIBS}
 
+	set +e
 	if test "$bench" = ""; then
 		if test "$trace" = "true"; then
 		    echo ./a.out -test.short -test.timeout=${timeout}s "$@"
@@ -518,9 +519,11 @@ xno)
 		wait $pid
 		status=$?
 		if ! test -f gotest-timeout; then
-		    out=`ps -o pid,ppid | grep " $alarmpid" | cut -f1 -d" "`
-		    if test "x$out" != "x"; then
-		        kill -9 $out
+		    sleeppid=`ps -o pid,ppid,cmd | grep " $alarmpid " | grep sleep | sed -e 's/ *\([0-9]*\) .*$/\1/'`
+		    kill $alarmpid
+		    wait $alarmpid
+		    if test "$sleeppid" != ""; then
+			kill $sleeppid
 		    fi
 		fi
 	else