aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-12-12 22:48:46 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-12-12 22:48:46 +0000
commit44cacba39d28fcf92f328957be7e20398dee7de2 (patch)
treefcb621133abb95392f609d396451e79952212df5
parenta6ef2ac9d92d85ff03ecc40c4aa80269289fbbd6 (diff)
downloadgcc-44cacba39d28fcf92f328957be7e20398dee7de2.zip
gcc-44cacba39d28fcf92f328957be7e20398dee7de2.tar.gz
gcc-44cacba39d28fcf92f328957be7e20398dee7de2.tar.bz2
os/signal: increase deliver time for signal testcase
This increases the time to wait for signals to be delivered in the TestAtomicStop testcase. When running gccgo tests on ppc64 or ppc64le, there are intermittent failures in this test because the wait time is too small. Updates golang/go#29046 Reviewed-on: https://go-review.googlesource.com/c/153879 From-SVN: r267068
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/os/signal/signal_test.go6
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ccdfb1c..2f67835 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-4db15776701a7cfc1abcef08f7a98c63343d17e6
+be6dbbdbe29f39d6d2ec0d5574ced398cb6e250a
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/os/signal/signal_test.go b/libgo/go/os/signal/signal_test.go
index ecb05fd..6ea59f4 100644
--- a/libgo/go/os/signal/signal_test.go
+++ b/libgo/go/os/signal/signal_test.go
@@ -432,12 +432,12 @@ func atomicStopTestProgram() {
// At this point we should either die from SIGINT or
// get a notification on cs. If neither happens, we
- // dropped the signal. Give it a second to deliver,
- // which is far far longer than it should require.
+ // dropped the signal. It is given 2 seconds to
+ // deliver, as needed for gccgo on some loaded test systems.
select {
case <-cs:
- case <-time.After(1 * time.Second):
+ case <-time.After(2 * time.Second):
if !printed {
fmt.Print("lost signal on tries:")
printed = true