test/fixedbugs/issue9355: fix build on windows and skip on nacl

Change-Id: If367cc1e8c2d744569513bc71da6e6c454c74e9a
Signed-off-by: Shenghou Ma <minux@golang.org>
Reviewed-on: https://go-review.googlesource.com/1802
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>

diff --git a/test/fixedbugs/issue9355.go b/test/fixedbugs/issue9355.go
index 7903ff2c4116c3cb6ed0ebd9807d222140af5ea6..a6cf0e32a886250f9b747ac7fd9fbeb207c36080 100644 (file)
--- a/test/fixedbugs/issue9355.go
+++ b/test/fixedbugs/issue9355.go
@@ -17,7 +17,7 @@ import (
 )
 
 func main() {
-       if runtime.Compiler != "gc" {
+       if runtime.Compiler != "gc" || runtime.GOOS == "nacl" {
                return
        }
        a, err := build.ArchChar(runtime.GOARCH)
@@ -27,10 +27,10 @@ func main() {
        }
        out := run("go", "tool", a+"g", "-S", filepath.Join("fixedbugs", "issue9355.dir", "a.go"))
        patterns := []string{
-               `rel 0\+\d t=1 \"\"\.x\+8\n`,  // y = &x.b
-               `rel 0\+\d t=1 \"\"\.x\+28\n`, // z = &x.d.q
-               `rel 0\+\d t=1 \"\"\.b\+5\n`,  // c = &b[5]
-               `rel 0\+\d t=1 \"\"\.x\+88\n`, // w = &x.f[3].r
+               `rel 0\+\d t=1 \"\"\.x\+8\r?\n`,  // y = &x.b
+               `rel 0\+\d t=1 \"\"\.x\+28\r?\n`, // z = &x.d.q
+               `rel 0\+\d t=1 \"\"\.b\+5\r?\n`,  // c = &b[5]
+               `rel 0\+\d t=1 \"\"\.x\+88\r?\n`, // w = &x.f[3].r
        }
        for _, p := range patterns {
                if ok, err := regexp.Match(p, out); !ok || err != nil {