diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-02-10 16:13:17 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-02-10 16:13:17 +0000 |
| commit | c8ebeb0e3c6b093e649592be7d51d1c0032a1dc7 (patch) | |
| tree | bb832c8ec1fee906061fa6f7a5fa3fb4e910d68c /libgo/testsuite/gotest | |
| parent | d254eda348d5b037f433a3525bdd635e9ee07561 (diff) | |
| download | gcc-c8ebeb0e3c6b093e649592be7d51d1c0032a1dc7.tar.gz | |
2016-02-10 Basile Starynkevitch <basile@starynkevitch.net>
{{merging with more of GCC 6, using
svn merge -r225091:227000 ^/trunk }}
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@233280 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/testsuite/gotest')
| -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 3596d727ff1..b2ee3ec248d 100755 --- a/libgo/testsuite/gotest +++ b/libgo/testsuite/gotest @@ -518,7 +518,10 @@ xno) wait $pid status=$? if ! test -f gotest-timeout; then - kill $alarmpid + 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 |