Skip to content

Commit

Permalink
runtime: fix TestGdbConst on windows
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
aarzilli authored and alexbrainman committed Sep 25, 2017
1 parent 45395b5 commit 5e92c41
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/runtime/runtime-gdb_test.go
Expand Up @@ -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")
}
}

0 comments on commit 5e92c41

Please sign in to comment.