Commit 42534cbc authored by Alex Brainman's avatar Alex Brainman

test: change run.go to ignore \r in compiler output (fixes windows build)

R=golang-dev, dave, minux.ma, remyoudompheng
CC=golang-dev
https://golang.org/cl/6460093
parent b04c890a
...@@ -400,6 +400,9 @@ func (t *test) errorCheck(outStr string, full, short string) (err error) { ...@@ -400,6 +400,9 @@ func (t *test) errorCheck(outStr string, full, short string) (err error) {
// 6g error messages continue onto additional lines with leading tabs. // 6g error messages continue onto additional lines with leading tabs.
// Split the output at the beginning of each line that doesn't begin with a tab. // Split the output at the beginning of each line that doesn't begin with a tab.
for _, line := range strings.Split(outStr, "\n") { for _, line := range strings.Split(outStr, "\n") {
if strings.HasSuffix(line, "\r") { // remove '\r', output by compiler on windows
line = line[:len(line)-1]
}
if strings.HasPrefix(line, "\t") { if strings.HasPrefix(line, "\t") {
out[len(out)-1] += "\n" + line out[len(out)-1] += "\n" + line
} else { } else {
......
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