kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Account for Windows line endings in runner.

Browse Source 
Otherwise the split on "--- DONE ---\n" gets confused.

Change-Id: I74561a99e52b98e85f67efd85523213ad443d325
Reviewed-on: https://boringssl-review.googlesource.com/7283
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-03-02 10:59:16 -05:00 committed by Adam Langley
parent 29ec5d1fda
commit 9bea349660
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/test/runner/runner.go
View File

@ -736,8 +736,9 @@ func runTest(test *testCase, shimPath string, mallocNumToFail int64) error {
}
}
stdout := string(stdoutBuf.Bytes())
stderr := string(stderrBuf.Bytes())
// Account for Windows line endings.
stdout := strings.Replace(string(stdoutBuf.Bytes()), "\r\n", "\n", -1)
stderr := strings.Replace(string(stderrBuf.Bytes()), "\r\n", "\n", -1)
// Separate the errors from the shim and those from tools like
// AddressSanitizer.