diff options
| author | Austin Clements <austin@google.com> | 2020-04-03 12:22:27 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2020-04-08 18:35:49 +0000 |
| commit | f7e6ab44b410ef56bb89da182948a451d3cca34c (patch) | |
| tree | 9d49b461aff716c2d398e720c9bee93c20e1898e /src/path | |
| parent | da8591b61c141ca58e4b3eae382d2827006344fd (diff) | |
| download | go-f7e6ab44b410ef56bb89da182948a451d3cca34c.tar.gz go-f7e6ab44b410ef56bb89da182948a451d3cca34c.zip | |
all: remove scattered remnants of darwin/arm
This removes all conditions and conditional code (that I could find)
that depended on darwin/arm.
Fixes #35439 (since that only happened on darwin/arm)
Fixes #37611.
Change-Id: Ia4c32a5a4368ed75231075832b0b5bfb1ad11986
Reviewed-on: https://go-review.googlesource.com/c/go/+/227198
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/path')
| -rw-r--r-- | src/path/filepath/path_test.go | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/path/filepath/path_test.go b/src/path/filepath/path_test.go index 2d13149f3f..d6f680556c 100644 --- a/src/path/filepath/path_test.go +++ b/src/path/filepath/path_test.go @@ -431,12 +431,9 @@ func chtmpdir(t *testing.T) (restore func()) { } func TestWalk(t *testing.T) { - if runtime.GOOS == "darwin" { - switch runtime.GOARCH { - case "arm", "arm64": - restore := chtmpdir(t) - defer restore() - } + if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" { + restore := chtmpdir(t) + defer restore() } tmpDir, err := ioutil.TempDir("", "TestWalk") @@ -1281,11 +1278,8 @@ func TestDriveLetterInEvalSymlinks(t *testing.T) { } func TestBug3486(t *testing.T) { // https://golang.org/issue/3486 - if runtime.GOOS == "darwin" { - switch runtime.GOARCH { - case "arm", "arm64": - t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH) - } + if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" { + t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH) } root, err := filepath.EvalSymlinks(runtime.GOROOT() + "/test") if err != nil { |