aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCherry Mui <cherryyz@google.com>2022-12-06 21:47:29 +0000
committerCherry Mui <cherryyz@google.com>2022-12-06 22:07:25 +0000
commite535d6776c060da5f1947c4290159be0eb60ed6c (patch)
treea4e79f08e1c270911500a3d26e0752287eb8ebe6
parent89871dd8323f5eaa934f700327f9256d960b0537 (diff)
downloadgo-e535d6776c060da5f1947c4290159be0eb60ed6c.tar.gz
go-e535d6776c060da5f1947c4290159be0eb60ed6c.zip
Revert "runtime/pprof: unskip TestTimeVDSO on Android"
This reverts CL 455358, commit 98da0fb43fb481a25b3b4399cd9f517fe94d9f3f. Reason for revert: still failing https://build.golang.org/log/c9f13a76069f523b5b4a37a75ec52b30a1f3427a Change-Id: I8246d233c4fb86781b882f19dea82065cc21bc26 Reviewed-on: https://go-review.googlesource.com/c/go/+/455696 Run-TryBot: Cherry Mui <cherryyz@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Michael Pratt <mpratt@google.com>
-rw-r--r--src/runtime/pprof/pprof_test.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go
index e83eb0015f..39bc9d11f1 100644
--- a/src/runtime/pprof/pprof_test.go
+++ b/src/runtime/pprof/pprof_test.go
@@ -2262,6 +2262,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)
+ }
+
matches := matchAndAvoidStacks(stackContains, []string{"time.now"}, avoidFunctions())
p := testCPUProfile(t, matches, func(dur time.Duration) {
t0 := time.Now()