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

diff --git a/src/cmd/gotest/gotest.go b/src/cmd/gotest/gotest.go
index 210798c63fe01aecd310eb055a0a6b5727ee244c..2455aa88f4154b43b66d60ba89f4bae4e0f96a89 100644 (file)
--- a/src/cmd/gotest/gotest.go
+++ b/src/cmd/gotest/gotest.go
@@ -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
 }