---

yaml
---
r: 347050
b: refs/heads/master
c: 75de100
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 935258d8a611404c5d87c4d8476832060002bf52
+refs/heads/master: 75de100e5b3e8b9de27713e02c7b1d19d74552e5
 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

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

trunk/test/stdlib/OptionalTraps.swift

@@ -36,7 +36,7 @@ OptionalTraps.test("UnwrapNone/location")
     { _isFastAssertConfiguration() },
     reason: "this trap is not guaranteed to happen in -Ounchecked"))
   .crashOutputMatches(_isDebugAssertConfiguration()
-                        ? "test/stdlib/OptionalTraps.swift, line 45"
+                        ? "OptionalTraps.swift, line 45"
                         : "")
   .code {
   expectCrashLater()