runtime/trace: skip tests if parsing fails with timestamp error

already skips tests in case of the timestamp error, eg. #97757

Change-Id: Ia696e83cba2e3ed50181a8100b964847092a7365
GitHub-Last-Rev: 8e5f607e14f6a15ed6da5f205c4ca67a4adb6fc8
GitHub-Pull-Request: golang/go#55918
Reviewed-on: https://go-review.googlesource.com/c/go/+/435855
Reviewed-by: Michael Pratt <mpratt@google.com>
Reviewed-by: Joel Sing <joel@sing.id.au>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>

diff --git a/src/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go
index 5d5eb33fde3e2633bc7362c1bd0e3e48e68ff351..1bf5d50b830b60c3b64c992e2230bce3e3c42654 100644 (file)
--- 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 95964b111bd8f1a8ac920914f1333af98d04510a..7d9299f131c52a88297174969840551f59b89188 100644 (file)
--- 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")