Commit d0ceffe5 by Ian Lance Taylor

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
parent 82b11019
6fb7c3509a4eda7d2403900981b53029d6727037 5891a4c0615f469edcefc6d7a85a88984ba940aa
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the gofrontend repository. merge done from the gofrontend repository.
...@@ -518,7 +518,10 @@ xno) ...@@ -518,7 +518,10 @@ xno)
wait $pid wait $pid
status=$? status=$?
if ! test -f gotest-timeout; then 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 fi
else else
if test "$trace" = "true"; then if test "$trace" = "true"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment