diff options
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/crash_cgo_test.go | 10 | ||||
| -rw-r--r-- | src/runtime/testdata/testprogcgo/issue29707.go | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go index 5d5eb33fde..1bf5d50b83 100644 --- a/src/runtime/crash_cgo_test.go +++ b/src/runtime/crash_cgo_test.go @@ -730,7 +730,10 @@ func TestCgoTraceParser(t *testing.T) { } output := runTestProg(t, "testprogcgo", "CgoTraceParser") want := "OK\n" - if output != want { + ErrTimeOrder := "ErrTimeOrder\n" + if output == ErrTimeOrder { + t.Skipf("skipping due to golang.org/issue/16755: %v", output) + } else if output != want { t.Fatalf("want %s, got %s\n", want, output) } } @@ -743,7 +746,10 @@ func TestCgoTraceParserWithOneProc(t *testing.T) { } output := runTestProg(t, "testprogcgo", "CgoTraceParser", "GOMAXPROCS=1") want := "OK\n" - if output != want { + ErrTimeOrder := "ErrTimeOrder\n" + if output == ErrTimeOrder { + t.Skipf("skipping due to golang.org/issue/16755: %v", output) + } else if output != want { t.Fatalf("GOMAXPROCS=1, want %s, got %s\n", want, output) } } diff --git a/src/runtime/testdata/testprogcgo/issue29707.go b/src/runtime/testdata/testprogcgo/issue29707.go index 95964b111b..7d9299f131 100644 --- a/src/runtime/testdata/testprogcgo/issue29707.go +++ b/src/runtime/testdata/testprogcgo/issue29707.go @@ -50,7 +50,9 @@ func CgoTraceParser() { trace.Stop() _, err := traceparser.Parse(buf, "") - if err != nil { + if err == traceparser.ErrTimeOrder { + fmt.Println("ErrTimeOrder") + } else if err != nil { fmt.Println("Parse error: ", err) } else { fmt.Println("OK") |