diff options
| author | Alex Brainman <alex.brainman@gmail.com> | 2012-08-16 16:46:59 +1000 |
|---|---|---|
| committer | Alex Brainman <alex.brainman@gmail.com> | 2012-08-16 16:46:59 +1000 |
| commit | 556a0443f101fe8d622c9a45dab6d36c56b096d1 (patch) | |
| tree | a65408cb0d2c63c93a11623fc0cb33f7905be1cf /test/run.go | |
| parent | dfb074d49212b4d0ccbe27afc59355873a401bd1 (diff) | |
| download | go-556a0443f101fe8d622c9a45dab6d36c56b096d1.tar.gz | |
test: change run.go to ignore \r in compiler output (fixes windows build)
R=golang-dev, dave, minux.ma, remyoudompheng
CC=golang-dev
http://codereview.appspot.com/6460093
Diffstat (limited to 'test/run.go')
| -rw-r--r-- | test/run.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/run.go b/test/run.go index 325d2ea41..b23860692 100644 --- a/test/run.go +++ b/test/run.go @@ -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. // Split the output at the beginning of each line that doesn't begin with a tab. 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") { out[len(out)-1] += "\n" + line } else { |