diff options
author | Russ Cox <rsc@golang.org> | 2014-05-20 12:10:19 -0400 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2014-05-20 12:10:19 -0400 |
commit | 098ea4458409e3dcdd22fe8d8bf60458c77bff92 (patch) | |
tree | 6fe56f650994801a51db4a1afde9cbc13fcd796f /test | |
parent | 20b83c2f8fee714eca0e3a80dbeebb4da8a377f6 (diff) | |
download | go-098ea4458409e3dcdd22fe8d8bf60458c77bff92.tar.gz |
build: make nacl pass
Add nacl.bash, the NaCl version of all.bash.
It's a separate script because it builds a variant of package syscall
with a large zip file embedded in it, containing all the input files
needed for tests.
Disable various tests new since the last round, mostly the ones using os/exec.
Fixes issue 7945.
LGTM=dave
R=golang-codereviews, remyoudompheng, dave, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/100590044
Diffstat (limited to 'test')
-rw-r--r-- | test/gc2.go | 4 | ||||
-rw-r--r-- | test/nosplit.go | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/gc2.go b/test/gc2.go index de52a4fbf..561516b8b 100644 --- a/test/gc2.go +++ b/test/gc2.go @@ -1,5 +1,7 @@ // run +// +build !nacl + // Copyright 2011 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. @@ -36,7 +38,7 @@ func main() { } runtime.ReadMemStats(memstats) - obj := memstats.HeapObjects - st.HeapObjects + obj := int64(memstats.HeapObjects - st.HeapObjects) if obj > N/5 { fmt.Println("too many objects left:", obj) os.Exit(1) diff --git a/test/nosplit.go b/test/nosplit.go index 20f4f9b6a..35aa51017 100644 --- a/test/nosplit.go +++ b/test/nosplit.go @@ -1,5 +1,7 @@ // run +// +build !nacl + // Copyright 2014 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. @@ -273,7 +275,6 @@ TestCases: ioutil.WriteFile(filepath.Join(dir, "asm.s"), buf.Bytes(), 0666) - cmd := exec.Command("go", "build") cmd.Dir = dir output, err := cmd.CombinedOutput() |