Commit 4b95575b authored by Keith Randall's avatar Keith Randall

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/21349Reviewed-by: 's avatarTodd Neal <todd@tneal.org>
parent af517da2
...@@ -155,6 +155,7 @@ func TestStdFixed(t *testing.T) { ...@@ -155,6 +155,7 @@ func TestStdFixed(t *testing.T) {
"issue6889.go", // gc-specific test "issue6889.go", // gc-specific test
"issue7746.go", // large constants - consumes too much memory "issue7746.go", // large constants - consumes too much memory
"issue11362.go", // canonical import path check "issue11362.go", // canonical import path check
"issue15002.go", // uses Mmap; testTestDir should consult build tags
) )
} }
......
// run
// +build amd64 // +build amd64
// +build linux darwin // +build linux darwin
// run
// Copyright 2016 The Go Authors. All rights reserved. // Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
......
...@@ -122,9 +122,9 @@ func main() { ...@@ -122,9 +122,9 @@ func main() {
<-test.donec <-test.donec
status := "ok " status := "ok "
errStr := "" errStr := ""
if _, isSkip := test.err.(skipError); isSkip { if e, isSkip := test.err.(skipError); isSkip {
test.err = nil 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" status = "FAIL"
} }
if test.err != nil { if test.err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment