qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 07:07:57 -07:00
Code Releases Activity

gotest: Fix fix for \r\n on windows.

Browse Source 
R=rsc, brainman, rh, r2
CC=golang-dev
https://golang.org/cl/4366045
This commit is contained in:
Rob Pike 2011-04-08 09:50:20 -07:00
parent db5c5d6fa6
commit ddd0fa1744
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cmd/gotest/gotest.go
View File

@ -234,15 +234,14 @@ func run(args ...string) {
// runWithStdout is like run, but returns the text of standard output with the last newline dropped. // runWithStdout is like run, but returns the text of standard output with the last newline dropped.
func runWithStdout(argv ...string) string { func runWithStdout(argv ...string) string {
s := doRun(argv, true) s := doRun(argv, true)
if strings.HasSuffix(s, "\r\n") {
s = s[:len(s)-2]
} else if strings.HasSuffix(s, "\n") {
s = s[:len(s)-1]
}
if len(s) == 0 { if len(s) == 0 {
Fatalf("no output from command %s", strings.Join(argv, " ")) Fatalf("no output from command %s", strings.Join(argv, " "))
} }
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 return s
} }