From: Cherry Mui <cherryyz@google.com>
Date: Mon, 27 Sep 2021 18:37:13 +0000 (-0400)
Subject: runtime/pprof: skip TestTimeVDSO on Android
X-Git-Tag: go1.18beta1~1161
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=788731387932e70d4dd951770c046c7eec9f9d96;p=gostls13.git

runtime/pprof: skip TestTimeVDSO on Android

The test is flaky on Android. VDSO may not be enabled so it may
not have the original problem anyway.

Change-Id: I73c2902c682a44d893e0d4e34f006c2377ef8816
Reviewed-on: https://go-review.googlesource.com/c/go/+/352509
Trust: Cherry Mui <cherryyz@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
---

diff --git a/src/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go
index 8c34d39ad5..f39d65c0b5 100644
--- a/src/runtime/pprof/pprof_test.go
+++ b/src/runtime/pprof/pprof_test.go
@@ -1650,6 +1650,11 @@ func TestTimeVDSO(t *testing.T) {
 	// Test that time functions have the right stack trace. In particular,
 	// it shouldn't be recursive.
 
+	if runtime.GOOS == "android" {
+		// Flaky on Android, issue 48655. VDSO may not be enabled.
+		testenv.SkipFlaky(t, 48655)
+	}
+
 	p := testCPUProfile(t, stackContains, []string{"time.now"}, avoidFunctions(), func(dur time.Duration) {
 		t0 := time.Now()
 		for {