qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 14:00:03 -07:00
Code Releases Activity

go/build: skip darwin/arm64 tests that need GOROOT

Browse Source 
Just like darwin/arm.

Change-Id: I1a9f51c572c14b78d35ea62f52927f2bdc46e4c0
Reviewed-on: https://go-review.googlesource.com/8821
Reviewed-by: Minux Ma <minux@golang.org>
This commit is contained in:
David Crawshaw 2015-04-11 19:28:29 -04:00
parent 5ad83082c0
commit 1d57943987
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/go/build/build_test.go
View File

@ -109,9 +109,12 @@ func TestMultiplePackageImport(t *testing.T) {
} }
func TestLocalDirectory(t *testing.T) { func TestLocalDirectory(t *testing.T) {
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm" { if runtime.GOOS == "darwin" {
switch runtime.GOARCH {
case "arm", "arm64":
t.Skipf("skipping on %s/%s, no valid GOROOT", runtime.GOOS, runtime.GOARCH) t.Skipf("skipping on %s/%s, no valid GOROOT", runtime.GOOS, runtime.GOARCH)
} }
}
cwd, err := os.Getwd() cwd, err := os.Getwd()
if err != nil { if err != nil {
@ -227,9 +230,12 @@ func TestMatchFile(t *testing.T) {
} }
func TestImportCmd(t *testing.T) { func TestImportCmd(t *testing.T) {
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm" { if runtime.GOOS == "darwin" {
switch runtime.GOARCH {
case "arm", "arm64":
t.Skipf("skipping on %s/%s, no valid GOROOT", runtime.GOOS, runtime.GOARCH) t.Skipf("skipping on %s/%s, no valid GOROOT", runtime.GOOS, runtime.GOARCH)
} }
}
p, err := Import("cmd/internal/objfile", "", 0) p, err := Import("cmd/internal/objfile", "", 0)
if err != nil { if err != nil {

5
src/go/build/deps_test.go
View File

@ -376,10 +376,11 @@ var allowedErrors = map[osPkg]bool{
} }
func TestDependencies(t *testing.T) { func TestDependencies(t *testing.T) {
if runtime.GOOS == "nacl" || (runtime.GOOS == "darwin" && runtime.GOARCH == "arm") { iOS := runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64")
if runtime.GOOS == "nacl" || iOS {
// Tests run in a limited file system and we do not // Tests run in a limited file system and we do not
// provide access to every source file. // provide access to every source file.
t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH) t.Skipf("skipping on %s/%s, missing full GOROOT", runtime.GOOS, runtime.GOARCH)
} }
var all []string var all []string