From: Elias Naur <elias.naur@gmail.com>
Date: Tue, 7 Mar 2017 19:04:23 +0000 (+0100)
Subject: runtime/pprof: fix the protobuf tests on Android
X-Git-Tag: go1.9beta1~1251
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b91b694b37b12724ae3c3925eb9a215ac9b36271;p=gostls13.git

runtime/pprof: fix the protobuf tests on Android

Change-Id: I5f85a7980b9a18d3641c4ee8b0992671a8421bb0
Reviewed-on: https://go-review.googlesource.com/37896
Run-TryBot: Elias Naur <elias.naur@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/runtime/pprof/proto_test.go b/src/runtime/pprof/proto_test.go
index aa2d03b449..98f217583b 100644
--- a/src/runtime/pprof/proto_test.go
+++ b/src/runtime/pprof/proto_test.go
@@ -70,7 +70,7 @@ func f2() { f2() }
 // testPCs returns two PCs and two corresponding memory mappings
 // to use in test profiles.
 func testPCs(t *testing.T) (addr1, addr2 uint64, map1, map2 *profile.Mapping) {
-	if runtime.GOOS == "linux" {
+	if runtime.GOOS == "linux" || runtime.GOOS == "android" {
 		// Figure out two addresses from /proc/self/maps.
 		mmap, err := ioutil.ReadFile("/proc/self/maps")
 		if err != nil {