---

yaml
---
r: 348026
b: refs/heads/master
c: d71a5be
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d1e35ac1452d7e39592368c9f6ae04146cb3bfc9
+refs/heads/master: d71a5be4cf7f8b1fe87a7c8d03fdf8e6f72bdd34
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/private/StdlibUnittest/StdlibUnittest.swift

@@ -934,7 +934,10 @@ class _ParentProcess {
     let (_, stdoutThread) = _stdlib_thread_create_block({
       while !self._childStdout.isEOF {
         self._childStdout.read()
-        while let line = self._childStdout.getline() {
+        while var line = self._childStdout.getline() {
+          if let cr = line.firstIndex(of: "\r") {
+            line.remove(at: cr)
+          }
           var done: Bool
           (done: done, ()) = onStdoutLine(line)
           if done { return }