diff options
| author | Cherry Zhang <cherryyz@google.com> | 2020-12-30 17:36:08 -0500 |
|---|---|---|
| committer | Cherry Zhang <cherryyz@google.com> | 2020-12-31 02:24:55 +0000 |
| commit | 95ce805d14642a8e8e40fe1f8f50b9b5a2c4e38b (patch) | |
| tree | 87a6279842ac2b97856f4daa273e14fed7c71a8a /src/io | |
| parent | 20d0991b86f533a734cad96b2002678d9750e6d8 (diff) | |
| download | go-95ce805d14642a8e8e40fe1f8f50b9b5a2c4e38b.tar.gz go-95ce805d14642a8e8e40fe1f8f50b9b5a2c4e38b.zip | |
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>
Diffstat (limited to 'src/io')
| -rw-r--r-- | src/io/fs/walk_test.go | 26 |
1 files changed, 0 insertions, 26 deletions
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) |