Merge pull request #61565 from hyp/eng/benchmark-relinux

[interop] cxx vector benchmark - reenable without SwiftPM support

Author: hyp

benchmark/cxx-source/CxxVectorSum.swift

@@ -15,24 +15,16 @@
 
 import TestsUtils
 
-public let benchmarks: [BenchmarkInfo] = []
-#if FIX_61472
+#if SWIFT_PACKAGE
+// FIXME: Needs fix for https://github.com/apple/swift/issues/61547.
 
-import std
+public let benchmarks = [BenchmarkInfo]()
 
-// FIXME: remove workaround for: https://github.com/apple/swift/issues/61472
-public func __workaround_std_import() {
-    let s = std.string()
-    blackHole(s.size())
-}
+#else
 
 import CxxStdlibPerformance
 import Cxx
 
-// FIXME: Linux needs fix for https://github.com/apple/swift/issues/61547.
-#if os(Linux)
-public let benchmarks: [BenchmarkInfo] = []
-#else
 public let benchmarks = [
   BenchmarkInfo(
       name: "CxxVecU32.sum.Cxx.rangedForLoop",
@@ -139,4 +131,3 @@ extension VectorOfU32.const_iterator : Equatable, UnsafeCxxInputIterator { }
 
 extension VectorOfU32: CxxSequence {}
 #endif
-#endif

benchmark/scripts/Benchmark_Driver

@@ -408,8 +408,9 @@ class MarkdownReportHandler(logging.StreamHandler):
         msg = self.format(record)
         stream = self.stream
         try:
-            if isinstance(msg, str) and getattr(stream, "encoding", None):
-                stream.write(msg.encode(stream.encoding))
+            if isinstance(msg, str) and (getattr(stream, "encoding", None) and
+               getattr(stream, "buffer", None)):
+                stream.buffer.write(msg.encode(stream.encoding))
             else:
                 stream.write(msg)
         except UnicodeError: