aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2015-08-20 17:10:45 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2015-08-20 17:10:45 +0000
commitf999c862ec256fe170b3dac777b7f34df250c35a (patch)
tree3cb896116e0cb0ae2c812edd1574d6e976c35015 /gcc/go
parent6992707b2a12c2323206c14f8c3983822d26c27c (diff)
downloadgcc-f999c862ec256fe170b3dac777b7f34df250c35a.zip
gcc-f999c862ec256fe170b3dac777b7f34df250c35a.tar.gz
gcc-f999c862ec256fe170b3dac777b7f34df250c35a.tar.bz2
libgo/testsuite: another fix for killing the sleep process
Avoid ps padding issues. Make sure we locate and kill just the sleep process. Reviewed-on: https://go-review.googlesource.com/13634 From-SVN: r227037
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 10f8b04..b2f305b 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-448d30b696461a39870d1b8beb1195e411300bfd
+ec34cfb0b148ff461df12c8f5270a06e2f438b7c
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.