From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 7 Aug 2015 10:10:00 +0000 (+0000)
Subject: libgo/testsuite: don't call kill without args
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d0ceffe507fe615536259a326fcb7e6eb9a42765;p=gcc.git

libgo/testsuite: don't call kill without args

    If the timeout subshell has no child processes,
    the "xargs | kill" will fail. Ensure there is
    some input for kill before calling it.

    Reviewed-on: https://go-review.googlesource.com/13295

From-SVN: r226719
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 99e7aef67a2..a5b77a452f8 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -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.
diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index 7d5e99f4987..b2ee3ec248d 100755
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -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