diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-08-07 10:10:00 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-08-07 10:10:00 +0000 |
| commit | 5e308b73d74b747ad614b297fbc4926402c754da (patch) | |
| tree | 0cf14d708c9182436efecdff9ddb8ffae45a6212 /libgo | |
| parent | 488d015657f4fc779cf9129df3b877596521e749 (diff) | |
| download | gcc-5e308b73d74b747ad614b297fbc4926402c754da.tar.gz | |
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
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@226719 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
| -rwxr-xr-x | libgo/testsuite/gotest | 5 |
1 files changed, 4 insertions, 1 deletions
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 |