From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 27 Jul 2015 17:34:11 +0000 (-0700)
Subject: go/internal/gcimporter: only run compile test if go tool is available
X-Git-Tag: go1.5beta3~56
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3f98b6a573a98470ce02344c5b91bf4d3cd38e14;p=gostls13.git

go/internal/gcimporter: only run compile test if go tool is available

Fixes build dashboard failures for android and nacl.

Change-Id: Id13896570061d3d8186f7b666ca1c37bcc789b0f
Reviewed-on: https://go-review.googlesource.com/12703
Reviewed-by: David Crawshaw <crawshaw@golang.org>
---

diff --git a/src/go/internal/gcimporter/gcimporter_test.go b/src/go/internal/gcimporter/gcimporter_test.go
index e5edadfc26..07993a801f 100644
--- a/src/go/internal/gcimporter/gcimporter_test.go
+++ b/src/go/internal/gcimporter/gcimporter_test.go
@@ -6,6 +6,7 @@ package gcimporter
 
 import (
 	"fmt"
+	"internal/testenv"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -33,6 +34,7 @@ func skipSpecialPlatforms(t *testing.T) {
 }
 
 func compile(t *testing.T, dirname, filename string) string {
+	testenv.MustHaveGoBuild(t)
 	cmd := exec.Command("go", "tool", "compile", filename)
 	cmd.Dir = dirname
 	out, err := cmd.CombinedOutput()