From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 11 Mar 2016 06:01:41 +0000 (-0800)
Subject: runtime: limit TestCgoCCodeSIGPROF test to 1 second
X-Git-Tag: go1.7beta1~1397
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b354f914174f971b26ac813236627b7cccaf3382;p=gostls13.git

runtime: limit TestCgoCCodeSIGPROF test to 1 second

Still fails about 20% of the time on my laptop.

Fixes #14766.

Change-Id: I169ab728c6022dceeb91188f5ad466ed6413c062
Reviewed-on: https://go-review.googlesource.com/20590
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/runtime/testdata/testprogcgo/aprof.go b/src/runtime/testdata/testprogcgo/aprof.go
index cf52107a30..b4b71f2861 100644
--- a/src/runtime/testdata/testprogcgo/aprof.go
+++ b/src/runtime/testdata/testprogcgo/aprof.go
@@ -17,6 +17,7 @@ import (
 	"bytes"
 	"fmt"
 	"runtime/pprof"
+	"time"
 )
 
 func init() {
@@ -31,7 +32,13 @@ func CgoCCodeSIGPROF() {
 	go func() {
 		for {
 			<-c
+			start := time.Now()
 			for i := 0; i < 1e7; i++ {
+				if i%1000 == 0 {
+					if time.Since(start) > time.Second {
+						break
+					}
+				}
 				C.GoNop()
 			}
 			c <- true