From: David Crawshaw <crawshaw@golang.org>
Date: Fri, 20 Nov 2015 15:42:05 +0000 (-0500)
Subject: os: use different test files on android
X-Git-Tag: go1.6beta1~354
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9fa6a2d42d5d6ded4e05f06148305354e66344d6;p=gostls13.git

os: use different test files on android

Some Android OS installations have very strange permissions on their
/system/etc directory, meaning that Readdir fails. Instead use
/system/framework, which is far more regular.

Change-Id: Iefc140614183cda0f875e0f6ef859f4d4eaad9da
Reviewed-on: https://go-review.googlesource.com/17078
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/os/os_test.go b/src/os/os_test.go
index ef06ba28d1..2ddaeb4f9c 100644
--- a/src/os/os_test.go
+++ b/src/os/os_test.go
@@ -47,10 +47,10 @@ var sysdir = func() *sysDir {
 	switch runtime.GOOS {
 	case "android":
 		return &sysDir{
-			"/system/etc",
+			"/system/framework",
 			[]string{
-				"audio_policy.conf",
-				"system_fonts.xml",
+				"ext.jar",
+				"framework.jar",
 			},
 		}
 	case "darwin":