diff options
| author | Russ Cox <rsc@golang.org> | 2015-06-05 11:01:53 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-06-16 18:07:36 +0000 |
| commit | 7bc3e5880675ce4aae245f46d193924cff5efdfb (patch) | |
| tree | bc5991015f83aa4852edaf31b096fc968c3f6369 /src/cmd/pack | |
| parent | 047f07a285edbc60f64018973be7ce6b341fe22d (diff) | |
| download | go-7bc3e5880675ce4aae245f46d193924cff5efdfb.tar.xz | |
all: extract "can I exec?" check from tests into internal/testenv
Change-Id: I7b54be9d8b50b39e01c6be21f310ae9a10404e9d
Reviewed-on: https://go-review.googlesource.com/10753
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/pack')
| -rw-r--r-- | src/cmd/pack/pack_test.go | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/cmd/pack/pack_test.go b/src/cmd/pack/pack_test.go index cd32020501..c305a87b57 100644 --- a/src/cmd/pack/pack_test.go +++ b/src/cmd/pack/pack_test.go @@ -8,12 +8,12 @@ import ( "bufio" "bytes" "fmt" + "internal/testenv" "io" "io/ioutil" "os" "os/exec" "path/filepath" - "runtime" "testing" "time" "unicode/utf8" @@ -198,15 +198,7 @@ func TestExtract(t *testing.T) { // Test that pack-created archives can be understood by the tools. func TestHello(t *testing.T) { - switch runtime.GOOS { - case "android", "nacl": - t.Skipf("skipping on %s", runtime.GOOS) - case "darwin": - switch runtime.GOARCH { - case "arm", "arm64": - t.Skipf("skipping on %s/%s, cannot fork", runtime.GOOS, runtime.GOARCH) - } - } + testenv.MustHaveGoBuild(t) dir := tmpDir(t) defer os.RemoveAll(dir) @@ -238,15 +230,7 @@ func TestHello(t *testing.T) { // Test that pack works with very long lines in PKGDEF. func TestLargeDefs(t *testing.T) { - switch runtime.GOOS { - case "android", "nacl": - t.Skipf("skipping on %s", runtime.GOOS) - case "darwin": - switch runtime.GOARCH { - case "arm", "arm64": - t.Skipf("skipping on %s/%s, cannot fork", runtime.GOOS, runtime.GOARCH) - } - } + testenv.MustHaveGoBuild(t) dir := tmpDir(t) defer os.RemoveAll(dir) |