From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Tue, 3 May 2016 23:33:32 +0000 (+0000)
Subject: cmd/vet: fix test's dependence on perl
X-Git-Tag: go1.7beta1~356
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4d5ac10f690bbc742a3cbf186ad8f3169a45ee26;p=gostls13.git

cmd/vet: fix test's dependence on perl

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>
---

diff --git a/src/cmd/vet/vet_test.go b/src/cmd/vet/vet_test.go
index 372ac2846b..2dd8ae4053 100644
--- a/src/cmd/vet/vet_test.go
+++ b/src/cmd/vet/vet_test.go
@@ -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")
 	}