aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/testdata
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2016-02-25 21:16:45 -0800
committerIan Lance Taylor <iant@golang.org>2016-02-26 19:20:47 +0000
commit8d94b9b820b093a32b7eb83d6481bc3da7ca276e (patch)
tree2d8ac45ef619aa2973bf62a397e4d8b36ea3a5da /src/runtime/testdata
parent90fea9d09ac9876147c7223884a09357c3418ed2 (diff)
downloadgo-8d94b9b820b093a32b7eb83d6481bc3da7ca276e.tar.xz
runtime: more deflaking of TestCgoCheckBytes
Fixes #14519. Change-Id: I8f78f67a463e6467e09df90446f7ebd28789d6c9 Reviewed-on: https://go-review.googlesource.com/19933 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> Run-TryBot: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/runtime/testdata')
-rw-r--r--src/runtime/testdata/testprogcgo/cgo.go14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/runtime/testdata/testprogcgo/cgo.go b/src/runtime/testdata/testprogcgo/cgo.go
index 5d2550dbb0..7a2e013d43 100644
--- a/src/runtime/testdata/testprogcgo/cgo.go
+++ b/src/runtime/testdata/testprogcgo/cgo.go
@@ -11,7 +11,9 @@ void foo2(void* p) {}
import "C"
import (
"fmt"
+ "os"
"runtime"
+ "strconv"
"time"
"unsafe"
)
@@ -83,8 +85,16 @@ func CgoTraceback() {
}
func CgoCheckBytes() {
- b := make([]byte, 1e6)
- for i := 0; i < 1e3; i++ {
+ try, _ := strconv.Atoi(os.Getenv("GO_CGOCHECKBYTES_TRY"))
+ if try <= 0 {
+ try = 1
+ }
+ b := make([]byte, 1e6*try)
+ start := time.Now()
+ for i := 0; i < 1e3*try; i++ {
C.foo2(unsafe.Pointer(&b[0]))
+ if time.Since(start) > time.Second {
+ break
+ }
}
}