Commit d9763147 authored by Alex Brainman's avatar Alex Brainman

gotest: handle \r\n returned by gomake on Windows (fixes build)

R=golang-dev, peterGo, rsc1
CC=Joe Poirier, golang-dev
https://golang.org/cl/4370048
parent 0ada4a2d
......@@ -240,6 +240,9 @@ func runWithStdout(argv ...string) string {
if s[len(s)-1] == '\n' {
s = s[:len(s)-1]
}
if len(s) > 0 && s[len(s)-1] == '\r' { // it is \r\n on Windows.
s = s[:len(s)-1]
}
return s
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment