From: Rob Pike <r@golang.org>
Date: Wed, 19 Feb 2014 23:33:47 +0000 (-0800)
Subject: cmd/pack: don't look for " in output from go env
X-Git-Tag: go1.3beta1~645
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2037756fcc6962808ce45e145b386ce70b41530c;p=gostls13.git

cmd/pack: don't look for " in output from go env
Windows at least doesn't emit one.
Maybe fix Windows build.

LGTM=bradfitz
R=bradfitz
CC=golang-codereviews
https://golang.org/cl/66120046
---

diff --git a/src/cmd/pack/pack_test.go b/src/cmd/pack/pack_test.go
index a073fa4521..cab236fa88 100644
--- a/src/cmd/pack/pack_test.go
+++ b/src/cmd/pack/pack_test.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strings"
+	"regexp"
 	"testing"
 	"time"
 	"unicode/utf8"
@@ -193,11 +193,15 @@ func TestHello(t *testing.T) {
 	}
 
 	out := run("go", "env")
-	i := strings.Index(out, "GOCHAR=\"")
-	if i < 0 {
+	re, err := regexp.Compile(`\s*GOCHAR="?(\w)"?`)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fields := re.FindStringSubmatch(out)
+	if fields == nil {
 		t.Fatal("cannot find GOCHAR in 'go env' output:\n", out)
 	}
-	char := out[i+8 : i+9]
+	char := fields[1]
 	run("go", "build", "cmd/pack") // writes pack binary to dir
 	run("go", "tool", char+"g", "hello.go")
 	run("./pack", "grc", "hello.a", "hello."+char)