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 97e6a69521ef82f83ce0ecfe3896d81b68fc5dbe..bd5afafe39097d3f7c257917b532fa5d1e19d9ac 100644 (file)
--- 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 526846ae2c753caba5dee2c3dc18e40097cc08ce..2cda42e08ac32593cc4c9c47b54df363dd2ef108 100644 (file)
--- 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 ffaf4d992ab3d1a30a0b867db4eaa2ec4b81c5e9..706eaa51f1ab34420e9ad65c648e3e954eac9cca 100644 (file)
--- 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 {