runtime: fix TestGdbConst on windows

Some (all?) versions of gdb on windows output "\r\n" as line ending
instead of "\n".

Fixes #22012

Change-Id: I798204fd9f616d6d2c9c28eb5227fadfc63c0d45
Reviewed-on: https://go-review.googlesource.com/65850
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
Run-TryBot: Alex Brainman <alex.brainman@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go
index 7b035871d5c10d2bd7ab31b571ee6079fb155e38..a190aa28d1bb32ec0c2e4fc09de206914da47802 100644 (file)
--- a/src/runtime/runtime-gdb_test.go
+++ b/src/runtime/runtime-gdb_test.go
@@ -431,11 +431,11 @@ func TestGdbConst(t *testing.T) {
        }
        got, _ := exec.Command("gdb", args...).CombinedOutput()
 
-       sgot := string(got)
+       sgot := strings.Replace(string(got), "\r\n", "\n", -1)
 
        t.Logf("output %q", sgot)
 
-       if strings.Index(sgot, "\n$1 = 42\n$2 = 18446744073709551615\n$3 = -1\n$4 = 1 '\\001'") < 0 {
+       if !strings.Contains(sgot, "\n$1 = 42\n$2 = 18446744073709551615\n$3 = -1\n$4 = 1 '\\001'") {
                t.Fatalf("output mismatch")
        }
 }