Specify an encoding

CodaFi · CodaFi · commit 740756879e00 · 2017-01-17T20:46:35.000-05:00
diff --git a/Tests/LLVMTests/FileCheck.swift b/Tests/LLVMTests/FileCheck.swift
@@ -107,7 +107,7 @@ public func fileCheckOutput(of FD : FileCheckFD = .stdout, withPrefixes prefixes
 }
 
 private func overrideFDAndCollectOutput(file : FileCheckFD, of block : () -> ()) -> String {
-  fflush(stdout)
+  fflush(file.filePtr)
   let oldFd = dup(file.fileno)
 
   let template = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("output.XXXXXX")
@@ -133,7 +133,7 @@ private func overrideFDAndCollectOutput(file : FileCheckFD, of block : () -> ())
     close(oldFd)
 
     let url = URL(fileURLWithFileSystemRepresentation: buffer, isDirectory: false, relativeTo: nil)
-    guard let s = try? String(contentsOf: url) else {
+    guard let s = try? String(contentsOf: url, encoding: .utf8) else {
       return ""
     }
     return s

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public func fileCheckOutput(of FD : FileCheckFD = .stdout, withPrefixes prefixes`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`private func overrideFDAndCollectOutput(file : FileCheckFD, of block : () -> ()) -> String {`
`110`		`- fflush(stdout)`
	`110`	`+ fflush(file.filePtr)`
`111`	`111`	`let oldFd = dup(file.fileno)`
`112`	`112`
`113`	`113`	`let template = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("output.XXXXXX")`
`@@ -133,7 +133,7 @@ private func overrideFDAndCollectOutput(file : FileCheckFD, of block : () -> ())`
`133`	`133`	`close(oldFd)`
`134`	`134`
`135`	`135`	`let url = URL(fileURLWithFileSystemRepresentation: buffer, isDirectory: false, relativeTo: nil)`
`136`		`- guard let s = try? String(contentsOf: url) else {`
	`136`	`+ guard let s = try? String(contentsOf: url, encoding: .utf8) else {`
`137`	`137`	`return ""`
`138`	`138`	`}`
`139`	`139`	`return s`