os: simplify ios checks in tests

Go 1.16 renamed the iOS port from darwin/arm64 to ios/arm64 and
darwin/arm64 was repurposed for the macOS ARM64 port (see
https://golang.org/doc/go1.16#darwin).

Change tests to only use GOOS=ios to detect special cases for iOS and
stop treating darwin/arm64 as iOS.

Change-Id: I6a19f16fa9ec159ab1386aeb8fe912585e457171
Reviewed-on: https://go-review.googlesource.com/c/go/+/374399
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/os/os_test.go b/src/os/os_test.go
index 5a813e0a7dd56a87f9d43561ddf7d6bfcf2c4cfc..82ca6f987d4ad9715e4020db8a9063331238c173 100644 (file)
--- a/src/os/os_test.go
+++ b/src/os/os_test.go
@@ -54,34 +54,31 @@ var sysdir = func() *sysDir {
                                "libpowermanager.so",
                        },
                }
-       case "darwin", "ios":
-               switch runtime.GOARCH {
-               case "arm64":
-                       wd, err := syscall.Getwd()
-                       if err != nil {
-                               wd = err.Error()
-                       }
-                       sd := &sysDir{
-                               filepath.Join(wd, "..", ".."),
-                               []string{
-                                       "ResourceRules.plist",
-                                       "Info.plist",
-                               },
-                       }
-                       found := true
-                       for _, f := range sd.files {
-                               path := filepath.Join(sd.name, f)
-                               if _, err := Stat(path); err != nil {
-                                       found = false
-                                       break
-                               }
-                       }
-                       if found {
-                               return sd
+       case "ios":
+               wd, err := syscall.Getwd()
+               if err != nil {
+                       wd = err.Error()
+               }
+               sd := &sysDir{
+                       filepath.Join(wd, "..", ".."),
+                       []string{
+                               "ResourceRules.plist",
+                               "Info.plist",
+                       },
+               }
+               found := true
+               for _, f := range sd.files {
+                       path := filepath.Join(sd.name, f)
+                       if _, err := Stat(path); err != nil {
+                               found = false
+                               break
                        }
-                       // In a self-hosted iOS build the above files might
-                       // not exist. Look for system files instead below.
                }
+               if found {
+                       return sd
+               }
+               // In a self-hosted iOS build the above files might
+               // not exist. Look for system files instead below.
        case "windows":
                return &sysDir{
                        Getenv("SystemRoot") + "\\system32\\drivers\\etc",
@@ -140,13 +137,8 @@ func equal(name1, name2 string) (r bool) {
 // localTmp returns a local temporary directory not on NFS.
 func localTmp() string {
        switch runtime.GOOS {
-       case "android", "windows":
+       case "android", "ios", "windows":
                return TempDir()
-       case "darwin", "ios":
-               switch runtime.GOARCH {
-               case "arm64":
-                       return TempDir()
-               }
        }
        return "/tmp"
 }
@@ -570,15 +562,12 @@ func TestReaddirnamesOneAtATime(t *testing.T) {
        switch runtime.GOOS {
        case "android":
                dir = "/system/bin"
-       case "darwin", "ios":
-               switch runtime.GOARCH {
-               case "arm64":
-                       wd, err := Getwd()
-                       if err != nil {
-                               t.Fatal(err)
-                       }
-                       dir = wd
+       case "ios":
+               wd, err := Getwd()
+               if err != nil {
+                       t.Fatal(err)
                }
+               dir = wd
        case "plan9":
                dir = "/bin"
        case "windows":
@@ -1399,22 +1388,19 @@ func TestChdirAndGetwd(t *testing.T) {
                dirs = []string{"/system/bin"}
        case "plan9":
                dirs = []string{"/", "/usr"}
-       case "darwin", "ios":
-               switch runtime.GOARCH {
-               case "arm64":
-                       dirs = nil
-                       for _, d := range []string{"d1", "d2"} {
-                               dir, err := os.MkdirTemp("", d)
-                               if err != nil {
-                                       t.Fatalf("TempDir: %v", err)
-                               }
-                               // Expand symlinks so path equality tests work.
-                               dir, err = filepath.EvalSymlinks(dir)
-                               if err != nil {
-                                       t.Fatalf("EvalSymlinks: %v", err)
-                               }
-                               dirs = append(dirs, dir)
+       case "ios":
+               dirs = nil
+               for _, d := range []string{"d1", "d2"} {
+                       dir, err := os.MkdirTemp("", d)
+                       if err != nil {
+                               t.Fatalf("TempDir: %v", err)
+                       }
+                       // Expand symlinks so path equality tests work.
+                       dir, err = filepath.EvalSymlinks(dir)
+                       if err != nil {
+                               t.Fatalf("EvalSymlinks: %v", err)
                        }
+                       dirs = append(dirs, dir)
                }
        }
        oldwd := Getenv("PWD")