Merge pull request #2797 from spevans/pr_darwin_test_fixes

Author: swift-ci

Tests/Foundation/Tests/TestFileManager.swift

@@ -1785,10 +1785,10 @@ VIDEOS=StopgapVideos
 
             // Relative Paths
             ".\\testfile",
-            "..\\\(tmpPath.lastPathComponent)\\.\\testfile",
+            "..\\\((tmpPath as NSString).lastPathComponent)\\.\\testfile",
             "testfile",
             "./testfile",
-            "../\(tmpPath.lastPathComponent)/./testfile",
+            "../\((tmpPath as NSString).lastPathComponent)/./testfile",
 
             // UNC Paths
             "\\\\.\\\(tmpPath)\\testfile",

Tests/Foundation/Tests/TestJSONEncoder.swift

@@ -855,7 +855,9 @@ class TestJSONEncoder : XCTestCase {
 
     func test_OutputFormattingValues() {
         XCTAssertEqual(JSONEncoder.OutputFormatting.prettyPrinted.rawValue, 1)
-        XCTAssertEqual(JSONEncoder.OutputFormatting.sortedKeys.rawValue, 2)
+        if #available(OSX 10.13, *) {
+            XCTAssertEqual(JSONEncoder.OutputFormatting.sortedKeys.rawValue, 2)
+        }
         XCTAssertEqual(JSONEncoder.OutputFormatting.withoutEscapingSlashes.rawValue, 8)
     }