Skip to content

Commit 95ce805

Browse files
committed
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 <[email protected]> Run-TryBot: Cherry Zhang <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 20d0991 commit 95ce805

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

src/io/fs/walk_test.go

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"io/ioutil"
1010
"os"
1111
pathpkg "path"
12-
"runtime"
1312
"testing"
1413
"testing/fstest"
1514
)
@@ -96,32 +95,7 @@ func mark(entry DirEntry, err error, errors *[]error, clear bool) error {
9695
return nil
9796
}
9897

99-
func chtmpdir(t *testing.T) (restore func()) {
100-
oldwd, err := os.Getwd()
101-
if err != nil {
102-
t.Fatalf("chtmpdir: %v", err)
103-
}
104-
d, err := ioutil.TempDir("", "test")
105-
if err != nil {
106-
t.Fatalf("chtmpdir: %v", err)
107-
}
108-
if err := os.Chdir(d); err != nil {
109-
t.Fatalf("chtmpdir: %v", err)
110-
}
111-
return func() {
112-
if err := os.Chdir(oldwd); err != nil {
113-
t.Fatalf("chtmpdir: %v", err)
114-
}
115-
os.RemoveAll(d)
116-
}
117-
}
118-
11998
func TestWalkDir(t *testing.T) {
120-
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
121-
restore := chtmpdir(t)
122-
defer restore()
123-
}
124-
12599
tmpDir, err := ioutil.TempDir("", "TestWalk")
126100
if err != nil {
127101
t.Fatal("creating temp dir:", err)

0 commit comments

Comments
 (0)