runtime,misc/cgo/test: disable broken tests so we can test the rest

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/7486048

diff --git a/misc/cgo/test/cthread.go b/misc/cgo/test/cthread.go
index d918d033fe4467cfe63d780e01310524ed7a34d5..d295d008abdcb217cb8de172a4e92cc42bc471ed 100644 (file)
--- a/misc/cgo/test/cthread.go
+++ b/misc/cgo/test/cthread.go
@@ -34,6 +34,10 @@ func testCthread(t *testing.T) {
        if runtime.GOARCH == "arm" {
                t.Skip("testCthread disabled on arm")
        }
+       // TODO(brainman): http://golang.org/issue/4955
+       if runtime.GOOS == "windows" {
+               t.Skip("testCthread disabled on windows: http://golang.org/issue/4955")
+       }
 
        C.doAdd(10, 6)
 

diff --git a/src/pkg/runtime/syscall_windows_test.go b/src/pkg/runtime/syscall_windows_test.go
index f04d2cd543d28763bce697023cb52a725c600876..0b6503b1e880c4635c7de573f9176916b4605bf7 100644 (file)
--- a/src/pkg/runtime/syscall_windows_test.go
+++ b/src/pkg/runtime/syscall_windows_test.go
@@ -172,6 +172,9 @@ func TestCallbackGC(t *testing.T) {
 }
 
 func TestCallbackPanic(t *testing.T) {
+       // TODO(brainman): http://golang.org/issue/4971
+       t.Skip("TestCallbackPanic disabled: http://golang.org/issue/4971")
+
        // Make sure panic during callback unwinds properly.
        if runtime.LockedOSThread() {
                t.Fatal("locked OS thread on entry to TestCallbackPanic")

diff --git a/src/run.bat b/src/run.bat
index 5f7164a0c976d10ac3dd8aac2d37dc8c97a1f4c2..3f950f5414becdda53f0dd83c3aff8b663a79ef4 100644 (file)
--- a/src/run.bat
+++ b/src/run.bat
@@ -72,8 +72,6 @@ if errorlevel 1 goto fail
 echo.
 
 :: cgo tests
-:: issue 4955 - cgo is broken
-goto nocgo
 if x%CGO_ENABLED% == x0 goto nocgo
 echo # ..\misc\cgo\life
 go run %GOROOT%\test\run.go - ..\misc\cgo\life