diff options
Diffstat (limited to 'go/patch/go-1.11.2/go5.patch')
-rw-r--r-- | go/patch/go-1.11.2/go5.patch | 106 |
1 files changed, 0 insertions, 106 deletions
diff --git a/go/patch/go-1.11.2/go5.patch b/go/patch/go-1.11.2/go5.patch deleted file mode 100644 index c0807e9b..00000000 --- a/go/patch/go-1.11.2/go5.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git src/runtime/crash_test.go src/runtime/crash_test.go -index 81cf5df42d..3607992788 100644 ---- src/runtime/crash_test.go -+++ src/runtime/crash_test.go -@@ -219,22 +219,27 @@ func testDeadlock(t *testing.T, name string) { - } - - func TestSimpleDeadlock(t *testing.T) { -+ t.Skip("deadlock detection fails with external linker") - testDeadlock(t, "SimpleDeadlock") - } - - func TestInitDeadlock(t *testing.T) { -+ t.Skip("deadlock detection fails with external linker") - testDeadlock(t, "InitDeadlock") - } - - func TestLockedDeadlock(t *testing.T) { -+ t.Skip("deadlock detection fails with external linker") - testDeadlock(t, "LockedDeadlock") - } - - func TestLockedDeadlock2(t *testing.T) { -+ t.Skip("deadlock detection fails with external linker") - testDeadlock(t, "LockedDeadlock2") - } - - func TestGoexitDeadlock(t *testing.T) { -+ t.Skip("deadlock detection fails with external linker") - output := runTestProg(t, "testprog", "GoexitDeadlock") - want := "no goroutines (main called runtime.Goexit) - deadlock!" - if !strings.Contains(output, want) { -@@ -271,6 +276,7 @@ panic: again - } - - func TestGoexitCrash(t *testing.T) { -+ t.Skip("deadlock detection fails with external linker") - output := runTestProg(t, "testprog", "GoexitExit") - want := "no goroutines (main called runtime.Goexit) - deadlock!" - if !strings.Contains(output, want) { -@@ -329,6 +335,7 @@ func TestBreakpoint(t *testing.T) { - } - - func TestGoexitInPanic(t *testing.T) { -+ t.Skip("deadlock detection fails with external linker") - // see issue 8774: this code used to trigger an infinite recursion - output := runTestProg(t, "testprog", "GoexitInPanic") - want := "fatal error: no goroutines (main called runtime.Goexit) - deadlock!" -@@ -393,6 +400,7 @@ func TestPanicAfterGoexit(t *testing.T) { - } - - func TestRecoveredPanicAfterGoexit(t *testing.T) { -+ t.Skip("deadlock detection fails with external linker") - output := runTestProg(t, "testprog", "RecoveredPanicAfterGoexit") - want := "fatal error: no goroutines (main called runtime.Goexit) - deadlock!" - if !strings.HasPrefix(output, want) { -diff --git src/runtime/proc_test.go src/runtime/proc_test.go -index ad325987ac..d9d6feb498 100644 ---- src/runtime/proc_test.go -+++ src/runtime/proc_test.go -@@ -373,9 +373,10 @@ func TestGCFairness2(t *testing.T) { - - func TestNumGoroutine(t *testing.T) { - output := runTestProg(t, "testprog", "NumGoroutine") -- want := "1\n" -- if output != want { -- t.Fatalf("want %q, got %q", want, output) -+ want1 := "1\n" -+ want2 := "2\n" -+ if output != want1 && out != want2 { -+ t.Fatalf("want %q, got %q", want1, output) - } - - buf := make([]byte, 1<<20) -diff --git test/fixedbugs/bug429_run.go test/fixedbugs/bug429_run.go -index 30298de97b..3301a11ad9 100644 ---- test/fixedbugs/bug429_run.go -+++ test/fixedbugs/bug429_run.go -@@ -1,5 +1,5 @@ - // +build !nacl,!js --// runtarget -+// skip - - // Copyright 2014 The Go Authors. All rights reserved. - // Use of this source code is governed by a BSD-style -diff --git test/goprint.go test/goprint.go -index 57eeac53a8..5951d4694f 100644 ---- test/goprint.go -+++ test/goprint.go -@@ -8,14 +8,9 @@ - - package main - --import ( -- "runtime" -- "time" --) -+import "time" - - func main() { - go println(42, true, false, true, 1.5, "world", (chan int)(nil), []int(nil), (map[string]int)(nil), (func())(nil), byte(255)) -- for runtime.NumGoroutine() > 1 { -- time.Sleep(10*time.Millisecond) -- } -+ time.Sleep(100*time.Millisecond) - } |