aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/runtime
diff options
context:
space:
mode:
authorDmitriy Vyukov <dvyukov@google.com>2014-08-19 19:32:27 +0400
committerDmitriy Vyukov <dvyukov@google.com>2014-08-19 19:32:27 +0400
commit8c25e08fbdf3511394f5ea5fc69c3ff988a61a5a (patch)
tree77e42c9296e84cf9dbc7dee1c6b571f8b0ec96ee /src/pkg/runtime
parentc6442c994a1976a2fecd01af1d26c925eb03c8a1 (diff)
downloadgo-8c25e08fbdf3511394f5ea5fc69c3ff988a61a5a.tar.xz
runtime: fix TestGcLastTime on windows
Intended to fix: http://build.golang.org/log/d6718ea67541b8c6be2bb14bcbc4e1c4261f67d7 LGTM=khr R=golang-codereviews, khr CC=golang-codereviews https://golang.org/cl/127520043
Diffstat (limited to 'src/pkg/runtime')
-rw-r--r--src/pkg/runtime/gc_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pkg/runtime/gc_test.go b/src/pkg/runtime/gc_test.go
index 383af5be3d..816fc89b04 100644
--- a/src/pkg/runtime/gc_test.go
+++ b/src/pkg/runtime/gc_test.go
@@ -165,7 +165,8 @@ func TestGcLastTime(t *testing.T) {
t.Fatalf("bad last GC time: got %v, want [%v, %v]", last, t0, t1)
}
pause := ms.PauseNs[(ms.NumGC+255)%256]
- if pause == 0 || pause > 10e9 {
+ // Due to timer granularity pause can actually be 0 on windows.
+ if (pause == 0 && runtime.GOOS != "windows") || pause > 10e9 {
t.Fatalf("bad last GC pause: got %v, want [0, 10e9]", pause)
}
}