From: Keith Randall <khr@golang.org>
Date: Thu, 31 Mar 2016 17:57:48 +0000 (-0700)
Subject: cmd/compile: fix build
X-Git-Tag: go1.7beta1~983
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4b95575bd4baa683bf1c5b75bd42adf8ab2871af;p=gostls13.git

cmd/compile: fix build

Pushed from an old client by mistake.  These are the
missing changes.

Change-Id: Ia8d61c5c0bde907369366ea9ea98711823342803
Reviewed-on: https://go-review.googlesource.com/21349
Reviewed-by: Todd Neal <todd@tneal.org>
---

diff --git a/src/go/types/stdlib_test.go b/src/go/types/stdlib_test.go
index 97e6a69521..bd5afafe39 100644
--- a/src/go/types/stdlib_test.go
+++ b/src/go/types/stdlib_test.go
@@ -155,6 +155,7 @@ func TestStdFixed(t *testing.T) {
 		"issue6889.go",  // gc-specific test
 		"issue7746.go",  // large constants - consumes too much memory
 		"issue11362.go", // canonical import path check
+		"issue15002.go", // uses Mmap; testTestDir should consult build tags
 	)
 }
 
diff --git a/test/fixedbugs/issue15002.go b/test/fixedbugs/issue15002.go
index 526846ae2c..2cda42e08a 100644
--- a/test/fixedbugs/issue15002.go
+++ b/test/fixedbugs/issue15002.go
@@ -1,6 +1,6 @@
+// run
 // +build amd64
 // +build linux darwin
-// run
 
 // Copyright 2016 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/run.go b/test/run.go
index ffaf4d992a..706eaa51f1 100644
--- a/test/run.go
+++ b/test/run.go
@@ -122,9 +122,9 @@ func main() {
 		<-test.donec
 		status := "ok  "
 		errStr := ""
-		if _, isSkip := test.err.(skipError); isSkip {
+		if e, isSkip := test.err.(skipError); isSkip {
 			test.err = nil
-			errStr = "unexpected skip for " + path.Join(test.dir, test.gofile) + ": " + errStr
+			errStr = "unexpected skip for " + path.Join(test.dir, test.gofile) + ": " + string(e)
 			status = "FAIL"
 		}
 		if test.err != nil {