From: Cherry Zhang <cherryyz@google.com>
Date: Wed, 30 Dec 2020 22:36:08 +0000 (-0500)
Subject: io/fs: remove darwin/arm64 special condition
X-Git-Tag: go1.16rc1~130
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=95ce805d14;p=gostls13.git

io/fs: remove darwin/arm64 special condition

It isn't necessary on darwin/arm64 (macOS).

It was probably leftover from the old code when darwin/arm64
meant iOS. The test passes on iOS builder. Apparently this is
not needed either. Remove.

Change-Id: I6fa0c55d6086325d4b722862c4fe6c30bcd6e6e8
Reviewed-on: https://go-review.googlesource.com/c/go/+/280158
Trust: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/io/fs/walk_test.go b/src/io/fs/walk_test.go
index 395471e2e8..ebc4e50fb3 100644
--- a/src/io/fs/walk_test.go
+++ b/src/io/fs/walk_test.go
@@ -9,7 +9,6 @@ import (
 	"io/ioutil"
 	"os"
 	pathpkg "path"
-	"runtime"
 	"testing"
 	"testing/fstest"
 )
@@ -96,32 +95,7 @@ func mark(entry DirEntry, err error, errors *[]error, clear bool) error {
 	return nil
 }
 
-func chtmpdir(t *testing.T) (restore func()) {
-	oldwd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	d, err := ioutil.TempDir("", "test")
-	if err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	if err := os.Chdir(d); err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	return func() {
-		if err := os.Chdir(oldwd); err != nil {
-			t.Fatalf("chtmpdir: %v", err)
-		}
-		os.RemoveAll(d)
-	}
-}
-
 func TestWalkDir(t *testing.T) {
-	if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
-		restore := chtmpdir(t)
-		defer restore()
-	}
-
 	tmpDir, err := ioutil.TempDir("", "TestWalk")
 	if err != nil {
 		t.Fatal("creating temp dir:", err)