From abd556ab70c652f480936540ed6598a3048c0669 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 21 Jan 2014 19:44:51 -0500 Subject: [PATCH] misc/cgo/testtls: make test less flaky Now it should always fail on ARM. (The fix is on its way too.) R=iant, r, dave CC=golang-codereviews https://golang.org/cl/55140043 --- misc/cgo/testtls/tls.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/misc/cgo/testtls/tls.go b/misc/cgo/testtls/tls.go index a9546a61c2..8e9ee70033 100644 --- a/misc/cgo/testtls/tls.go +++ b/misc/cgo/testtls/tls.go @@ -15,14 +15,16 @@ import ( ) func testTLS(t *testing.T) { - var keyVal C.int = 1234 - runtime.LockOSThread() defer runtime.UnlockOSThread() - C.setTLS(C.int(keyVal)) - storedVal := C.getTLS() - if storedVal != keyVal { - t.Fatalf("stored %d want %d", storedVal, keyVal) + if val := C.getTLS(); val != 0 { + t.Fatalf("at start, C.getTLS() = %#x, want 0", val) + } + + const keyVal = 0x1234 + C.setTLS(keyVal) + if val := C.getTLS(); val != keyVal { + t.Fatalf("at end, C.getTLS() = %#x, want %#x", val, keyVal) } } -- 2.48.1