]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/vet: fix test's dependence on perl
authorBrad Fitzpatrick <bradfitz@golang.org>
Tue, 3 May 2016 23:33:32 +0000 (23:33 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Tue, 3 May 2016 23:59:56 +0000 (23:59 +0000)
Change-Id: I774dbd4f90ef271a0969c3c8e65d145669312e3e
Reviewed-on: https://go-review.googlesource.com/22745
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ross Light <light@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/cmd/vet/vet_test.go

index 372ac2846bf9e46483796bb5a17016ec6cb08786..2dd8ae4053350ee33dd97b3a8687881dcff01657 100644 (file)
@@ -34,6 +34,9 @@ func MustHavePerl(t *testing.T) {
        case "plan9", "windows":
                t.Skipf("skipping test: perl not available on %s", runtime.GOOS)
        }
+       if _, err := exec.LookPath("perl"); err != nil {
+               t.Skipf("skipping test: perl not found in path")
+       }
 }
 
 var (
@@ -42,11 +45,11 @@ var (
 )
 
 func Build(t *testing.T) {
+       testenv.MustHaveGoBuild(t)
+       MustHavePerl(t)
        if built {
                return
        }
-       testenv.MustHaveGoBuild(t)
-       MustHavePerl(t)
        if failed {
                t.Skip("cannot run on this environment")
        }