code review 108460043: os: adjust tests for android file system

os: adjust tests for android file system

[crawshaw, 2014-07-08 14:48:43]

Hello golang-codereviews@googlegroups.com (cc:
golang-codereviews@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go

[bradfitz, 2014-07-08 16:10:23]

LGTM
 On Jul 8, 2014 7:48 AM, <crawshaw@golang.org> wrote:

> Reviewers: golang-codereviews,
>
> Message:
> Hello golang-codereviews@googlegroups.com (cc:
> golang-codereviews@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> os: adjust tests for android file system
>
> Please review this at https://codereview.appspot.com/108460043/
>
> Affected files (+30, -14 lines):
>   M src/pkg/os/os_test.go
>   M src/pkg/os/path_test.go
>
>
> Index: src/pkg/os/os_test.go
> ===================================================================
> --- a/src/pkg/os/os_test.go
> +++ b/src/pkg/os/os_test.go
> @@ -42,6 +42,14 @@
>
>  var sysdir = func() (sd *sysDir) {
>         switch runtime.GOOS {
> +       case "android":
> +               sd = &sysDir{
> +                       "/system/etc",
> +                       []string{
> +                               "audio_policy.conf",
> +                               "system_fonts.xml",
> +                       },
> +               }
>         case "windows":
>                 sd = &sysDir{
>                         Getenv("SystemRoot") + "\\system32\\drivers\\etc",
> @@ -108,7 +116,7 @@
>         // On Unix, override $TMPDIR in case the user
>         // has it set to an NFS-mounted directory.
>         dir := ""
> -       if runtime.GOOS != "windows" {
> +       if runtime.GOOS != "android" && runtime.GOOS != "windows" {
>                 dir = "/tmp"
>         }
>         f, err := ioutil.TempFile(dir, "_Go_"+testName)
> @@ -284,10 +292,12 @@
>         // big directory that doesn't change often.
>         dir := "/usr/bin"
>         switch runtime.GOOS {
> +       case "android":
> +               dir = "/system/bin"
> +       case "plan9":
> +               dir = "/bin"
>         case "windows":
>                 dir = Getenv("SystemRoot") + "\\system32"
> -       case "plan9":
> -               dir = "/bin"
>         }
>         file, err := Open(dir)
>         if err != nil {
> @@ -498,7 +508,7 @@
>
>  func TestSymlink(t *testing.T) {
>         switch runtime.GOOS {
> -       case "windows", "plan9", "nacl":
> +       case "android", "nacl", "plan9", "windows":
>                 t.Skipf("skipping on %s", runtime.GOOS)
>         }
>         from, to := "symlinktestfrom", "symlinktestto"
> @@ -630,8 +640,9 @@
>  }
>
>  func TestStartProcess(t *testing.T) {
> -       if runtime.GOOS == "nacl" {
> -               t.Skip("skipping on nacl")
> +       switch runtime.GOOS {
> +       case "android", "nacl":
> +               t.Skipf("skipping on %s", runtime.GOOS)
>         }
>
>         var dir, cmd string
> @@ -792,8 +803,11 @@
>         // These are chosen carefully not to be symlinks on a Mac
>         // (unlike, say, /var, /etc, and /tmp).
>         dirs := []string{"/", "/usr/bin"}
> -       // /usr/bin does not usually exist on Plan 9.
> -       if runtime.GOOS == "plan9" {
> +       // /usr/bin does not usually exist on Plan 9 or Android.
> +       switch runtime.GOOS {
> +       case "android":
> +               dirs = []string{"/", "/system/bin"}
> +       case "plan9":
>                 dirs = []string{"/", "/usr"}
>         }
>         for mode := 0; mode < 2; mode++ {
> @@ -972,9 +986,9 @@
>
>  func TestHostname(t *testing.T) {
>         // There is no other way to fetch hostname on windows, but via
> winapi.
> -       // On Plan 9 it is can be taken from #c/sysname as Hostname() does.
> +       // On Plan 9 it can be taken from #c/sysname as Hostname() does.
>         switch runtime.GOOS {
> -       case "windows", "plan9", "nacl":
> +       case "android", "nacl", "plan9", "windows":
>                 t.Skipf("skipping on %s", runtime.GOOS)
>         }
>
> @@ -1234,8 +1248,9 @@
>  }
>
>  func testKillProcess(t *testing.T, processKiller func(p *Process)) {
> -       if runtime.GOOS == "nacl" {
> -               t.Skip("skipping on nacl")
> +       switch runtime.GOOS {
> +       case "android", "nacl":
> +               t.Skipf("skipping on %s", runtime.GOOS)
>         }
>
>         dir, err := ioutil.TempDir("", "go-build")
> Index: src/pkg/os/path_test.go
> ===================================================================
> --- a/src/pkg/os/path_test.go
> +++ b/src/pkg/os/path_test.go
> @@ -198,8 +198,9 @@
>  }
>
>  func TestMkdirAllAtSlash(t *testing.T) {
> -       if runtime.GOOS == "windows" || runtime.GOOS == "plan9" {
> -               return
> +       switch runtime.GOOS {
> +       case "android", "plan9", "windows":
> +               t.Skipf("skipping on %s", runtime.GOOS)
>         }
>         RemoveAll("/_go_os_test")
>         err := MkdirAll("/_go_os_test/dir", 0777)
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

[crawshaw, 2014-07-08 17:44:00]

*** Submitted as https://code.google.com/p/go/source/detail?r=280a3d138bae ***

os: adjust tests for android file system

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/108460043

[gobot, 2014-07-08 22:54:50]

This CL appears to have broken the openbsd-386-rootbsd builder.
See http://build.golang.org/log/2ce1ff3f840a799cb417f218816cf3f0ca3b35ab