diff mbox

[gofrontend-dev] Re: libgo patch committed: Kill sleep processes in testsuite

Message ID CAOyqgcXqfrpxES9X9MJ0Dd2CGecKB3MnrqkHW-L01wYOjQua8Q@mail.gmail.com
State New
Headers show

Commit Message

Ian Lance Taylor Aug. 7, 2015, 10:10 a.m. UTC 
On Wed, Aug 5, 2015 at 1:58 AM, Andreas Schwab <schwab@suse.de> wrote:
> PASS
> kill: not enough arguments
> FAIL: net
> Makefile:4696: recipe for target 'net/check' failed
> make[4]: *** [net/check] Error 1
>
> $ cat net/check-testlog
> PASS
> kill: not enough arguments
> FAIL: net
> ../../../libgo/testsuite/gotest: line 514: gotest-timeout: No such file or directory

This patch by Andrew Wilkins fixes the problem.  Ran libgo testsuite
on x86_64-unknown-linux-gnu.  Committed to mainline.

Ian
diff mbox

Patch

Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE	(revision 226598)
+++ gcc/go/gofrontend/MERGE	(working copy)
@@ -1,4 +1,4 @@ 
-6fb7c3509a4eda7d2403900981b53029d6727037
+5891a4c0615f469edcefc6d7a85a88984ba940aa
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/testsuite/gotest
===================================================================
--- libgo/testsuite/gotest	(revision 226594)
+++ libgo/testsuite/gotest	(working copy)
@@ -518,7 +518,10 @@  xno)
 		wait $pid
 		status=$?
 		if ! test -f gotest-timeout; then
-		    ps -o pid,ppid | grep " $alarmpid" | cut -f1 -d" " | xargs kill -9
+		    out=`ps -o pid,ppid | grep " $alarmpid" | cut -f1 -d" "`
+		    if test "x$out" != "x"; then
+		        kill -9 $out
+		    fi
 		fi
 	else
 		if test "$trace" = "true"; then