Merge pull request #23011 from compnerd/file-the-line-with-the-registry

Windows test accomodations

Author: compnerd

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 }

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()