From: Hana Kim <hakim@google.com>
Date: Thu, 1 Mar 2018 16:42:09 +0000 (-0500)
Subject: runtime/trace: skip TestUserTaskSpan upon timestamp error
X-Git-Tag: go1.11beta1~1391
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e75f805e6f93af08cb8ae8b531d66277c7813bb0;p=gostls13.git

runtime/trace: skip TestUserTaskSpan upon timestamp error

Change-Id: I030baaa0a0abf1e43449faaf676d389a28a868a3
Reviewed-on: https://go-review.googlesource.com/97857
Run-TryBot: Hyang-Ah Hana Kim <hyangah@gmail.com>
Reviewed-by: Peter Weinberger <pjw@google.com>
---

diff --git a/src/runtime/trace/annotation_test.go b/src/runtime/trace/annotation_test.go
index 7198c0e720..72cf2bf7b0 100644
--- a/src/runtime/trace/annotation_test.go
+++ b/src/runtime/trace/annotation_test.go
@@ -50,6 +50,10 @@ func TestUserTaskSpan(t *testing.T) {
 
 	saveTrace(t, buf, "TestUserTaskSpan")
 	res, err := trace.Parse(buf, "")
+	if err == trace.ErrTimeOrder {
+		// golang.org/issues/16755
+		t.Skipf("skipping trace: %v", err)
+	}
 	if err != nil {
 		t.Fatalf("Parse failed: %v", err)
 	}