libgo patch committed: Kill sleep processes in testsuite

libgo patch committed: Kill sleep processes in testsuite

[Ian Lance Taylor]

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

This patch from Andrew Wilkins kills off extra sleep processes when
running the libgo testsuite.  Otherwise, the sleep process would
continue after the test completes.  This doesn't affect the testsuite
but the extra sleep processes are not desirable.  Committed to
mainline.

Ian

[-- Attachment #2: foo.txt --]
[-- Type: text/plain, Size: 822 bytes --]

Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE	(revision 226525)
+++ gcc/go/gofrontend/MERGE	(working copy)
@@ -1,4 +1,4 @@
-d5aad2f400a0f21724e33e4ae48e1583ed8b1a87
+33d59eff1bd5de29f1fbde3b7625db28595835fd
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/testsuite/gotest
===================================================================
--- libgo/testsuite/gotest	(revision 226510)
+++ libgo/testsuite/gotest	(working copy)
@@ -518,7 +518,7 @@ xno)
 		wait $pid
 		status=$?
 		if ! test -f gotest-timeout; then
-		    kill $alarmpid
+		    ps -o pid,ppid | grep " $alarmpid" | cut -f1 -d" " | xargs kill -9
 		fi
 	else
 		if test "$trace" = "true"; then

Re: libgo patch committed: Kill sleep processes in testsuite

[Andreas Schwab]

PASS
kill: not enough arguments
FAIL: net
Makefile:4696: recipe for target 'net/check' failed
make[4]: *** [net/check] Error 1

$ cat net/check-testlog
PASS
kill: not enough arguments
FAIL: net
../../../libgo/testsuite/gotest: line 514: gotest-timeout: No such file or directory

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: [gofrontend-dev] Re: libgo patch committed: Kill sleep processes in testsuite

[Ian Lance Taylor]

[ + Andrew Wilkins ]

On Wed, Aug 5, 2015 at 1:58 AM, Andreas Schwab <schwab@suse.de> wrote:
> PASS
> kill: not enough arguments
> FAIL: net
> Makefile:4696: recipe for target 'net/check' failed
> make[4]: *** [net/check] Error 1
>
> $ cat net/check-testlog
> PASS
> kill: not enough arguments
> FAIL: net
> ../../../libgo/testsuite/gotest: line 514: gotest-timeout: No such file or directory
>
> Andreas.
>
> --
> Andreas Schwab, SUSE Labs, schwab@suse.de
> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
> "And now for something completely different."
>
> --
> You received this message because you are subscribed to the Google Groups "gofrontend-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to gofrontend-dev+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.

Re: [gofrontend-dev] Re: libgo patch committed: Kill sleep processes in testsuite

[Ian Lance Taylor]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

On Wed, Aug 5, 2015 at 1:58 AM, Andreas Schwab <schwab@suse.de> wrote:
> PASS
> kill: not enough arguments
> FAIL: net
> Makefile:4696: recipe for target 'net/check' failed
> make[4]: *** [net/check] Error 1
>
> $ cat net/check-testlog
> PASS
> kill: not enough arguments
> FAIL: net
> ../../../libgo/testsuite/gotest: line 514: gotest-timeout: No such file or directory

This patch by Andrew Wilkins fixes the problem.  Ran libgo testsuite
on x86_64-unknown-linux-gnu.  Committed to mainline.

Ian

[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 935 bytes --]

Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE	(revision 226598)
+++ gcc/go/gofrontend/MERGE	(working copy)
@@ -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.
Index: libgo/testsuite/gotest
===================================================================
--- libgo/testsuite/gotest	(revision 226594)
+++ libgo/testsuite/gotest	(working copy)
@@ -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