]> Cypherpunks repositories - gostls13.git/commitdiff
os: use different test files on android
authorDavid Crawshaw <crawshaw@golang.org>
Fri, 20 Nov 2015 15:42:05 +0000 (10:42 -0500)
committerDavid Crawshaw <crawshaw@golang.org>
Fri, 20 Nov 2015 16:37:21 +0000 (16:37 +0000)
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>

src/os/os_test.go

index ef06ba28d1719982de37a495097854acfefc6682..2ddaeb4f9c581464d2a2718b8d154b7ec148841b 100644 (file)
@@ -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":