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 <[email protected]> Run-TryBot: Alex Brainman <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
golang · Sep 25, 2017 · 5e92c41 · 5e92c41
1 parent 45395b5
commit 5e92c41
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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")
 	}
 }