mirror of
https://github.com/golang/go
synced 2024-11-19 10:14:44 -07:00
path/filepath: get tests working on darwin/arm
Change-Id: Ic44d7837aaec58601e5d9cad8da5b958a809f4a0 Reviewed-on: https://go-review.googlesource.com/6400 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
parent
5c2233f261
commit
5432b4d346
@ -399,7 +399,31 @@ func mark(path string, info os.FileInfo, err error, errors *[]error, clear bool)
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func chtmpdir(t *testing.T) (restore func()) {
|
||||||
|
oldwd, err := os.Getwd()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("chtmpdir: %v", err)
|
||||||
|
}
|
||||||
|
d, err := ioutil.TempDir("", "test")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("chtmpdir: %v", err)
|
||||||
|
}
|
||||||
|
if err := os.Chdir(d); err != nil {
|
||||||
|
t.Fatal("chtmpdir: %v", err)
|
||||||
|
}
|
||||||
|
return func() {
|
||||||
|
if err := os.Chdir(oldwd); err != nil {
|
||||||
|
t.Fatal("chtmpdir: %v", err)
|
||||||
|
}
|
||||||
|
os.RemoveAll(d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestWalk(t *testing.T) {
|
func TestWalk(t *testing.T) {
|
||||||
|
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm" {
|
||||||
|
restore := chtmpdir(t)
|
||||||
|
defer restore()
|
||||||
|
}
|
||||||
makeTree(t)
|
makeTree(t)
|
||||||
errors := make([]error, 0, 10)
|
errors := make([]error, 0, 10)
|
||||||
clear := true
|
clear := true
|
||||||
@ -1009,6 +1033,9 @@ func TestDriveLetterInEvalSymlinks(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestBug3486(t *testing.T) { // http://golang.org/issue/3486
|
func TestBug3486(t *testing.T) { // http://golang.org/issue/3486
|
||||||
|
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm" {
|
||||||
|
t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH)
|
||||||
|
}
|
||||||
root, err := filepath.EvalSymlinks(runtime.GOROOT() + "/test")
|
root, err := filepath.EvalSymlinks(runtime.GOROOT() + "/test")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
Loading…
Reference in New Issue
Block a user