Merge pull request #40 from hartbit/update

Update TSC

Author: aciidgh

Sources/TSCBasic/FileSystem.swift

@@ -878,6 +878,18 @@ extension FileSystem {
         }
     }
 
+    /// Write bytes to the path if the given contents are different.
+    public func writeIfChanged(path: AbsolutePath, bytes: ByteString) throws {
+        try createDirectory(path.parentDirectory, recursive: true)
+
+        // Return if the contents are same.
+        if isFile(path), try readFileContents(path) == bytes {
+            return
+        }
+
+        try writeFileContents(path, bytes: bytes)
+    }
+
     /// Helper method to recurse and print the tree.
     private func recurse(fs: FileSystem, path: AbsolutePath, prefix: String = "") throws {
         let contents = try fs.getDirectoryContents(path)

Tests/LinuxMain.swift

@@ -1,12 +1 @@
-import XCTest
-
-import TSCBasicTests
-import TSCTestSupportTests
-import TSCUtilityTests
-
-var tests = [XCTestCaseEntry]()
-tests += TSCBasicTests.__allTests()
-tests += TSCTestSupportTests.__allTests()
-tests += TSCUtilityTests.__allTests()
-
-XCTMain(tests)
+fatalError("Use `swift test --enable-test-discovery` to run tests")

Tests/TSCBasicPerformanceTests/ByteStringPerfTests.swift

@@ -15,6 +15,7 @@ import TSCTestSupport
 
 class ByteStringPerfTests: XCTestCasePerf {
     func testInitialization() {
+      #if os(macOS)
         let listOfStrings: [String] = (0..<10).map { "This is the number: \($0)!\n" }
         let expectedTotalCount = listOfStrings.map({ $0.utf8.count }).reduce(0, +)
         measure {
@@ -28,5 +29,6 @@ class ByteStringPerfTests: XCTestCasePerf {
             }
             XCTAssertEqual(count, expectedTotalCount * N)
         }
+      #endif
     }
 }

Tests/TSCBasicPerformanceTests/OutputByteStreamPerfTests.swift

@@ -45,6 +45,7 @@ struct ByteSequenceIterator: IteratorProtocol {
 class OutputByteStreamPerfTests: XCTestCasePerf {
 
     func test1MBOfSequence_X10() {
+      #if os(macOS)
         let sequence = ByteSequence()
         measure {
             for _ in 0..<10 {
@@ -55,9 +56,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     func test1MBOfByte_X10() {
+      #if os(macOS)
         let byte = UInt8(0)
         measure {
             for _ in 0..<10 {
@@ -68,9 +71,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     func test1MBOfCharacters_X1() {
+      #if os(macOS)
         measure {
             for _ in 0..<1 {
                 let stream = BufferedOutputByteStream()
@@ -80,9 +85,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     func test1MBOf16ByteArrays_X100() {
+      #if os(macOS)
         // Test writing 1MB worth of 16 byte strings.
         let bytes16 = [UInt8](repeating: 0, count: 1 << 4)
 
@@ -95,10 +102,12 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     // This should give same performance as 16ByteArrays_X100.
     func test1MBOf16ByteArraySlice_X100() {
+      #if os(macOS)
         let bytes32 = [UInt8](repeating: 0, count: 1 << 5)
         // Test writing 1MB worth of 16 byte strings.
         let bytes16 = bytes32.suffix(from: bytes32.count/2)
@@ -112,9 +121,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     func test1MBOf1KByteArrays_X1000() {
+      #if os(macOS)
         // Test writing 1MB worth of 1K byte strings.
         let bytes1k = [UInt8](repeating: 0, count: 1 << 10)
 
@@ -127,9 +138,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     func test1MBOf16ByteStrings_X10() {
+      #if os(macOS)
         // Test writing 1MB worth of 16 byte strings.
         let string16 = String(repeating: "X", count: 1 << 4)
 
@@ -142,9 +155,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     func test1MBOf1KByteStrings_X100() {
+      #if os(macOS)
         // Test writing 1MB worth of 1K byte strings.
         let bytes1k = String(repeating: "X", count: 1 << 10)
 
@@ -157,9 +172,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     func test1MBOfJSONEncoded16ByteStrings_X10() {
+      #if os(macOS)
         // Test writing 1MB worth of JSON encoded 16 byte strings.
         let string16 = String(repeating: "X", count: 1 << 4)
 
@@ -172,9 +189,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertEqual(stream.bytes.count, 1 << 20)
             }
         }
+      #endif
     }
 
     func testFormattedJSONOutput() {
+      #if os(macOS)
         // Test the writing of JSON formatted output using stream operators.
         struct Thing {
             var value: String
@@ -195,9 +214,11 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertGreaterThan(stream.bytes.count, 1000)
             }
         }
+      #endif
     }
 
     func testJSONToString_X100() {
+      #if os(macOS)
         let foo = JSON.dictionary([
             "foo": .string("bar"),
             "bar": .int(2),
@@ -221,5 +242,6 @@ class OutputByteStreamPerfTests: XCTestCasePerf {
                 XCTAssertGreaterThan(result.utf8.count, 10)
             }
         }
+      #endif
     }
 }

Tests/TSCBasicPerformanceTests/PathPerfTests.swift

@@ -17,6 +17,7 @@ class PathPerfTests: XCTestCasePerf {
 
     /// Tests creating very long AbsolutePaths by joining path components.
     func testJoinPerf_X100000() {
+      #if os(macOS)
         let absPath = AbsolutePath("/hello/little")
         let relPath = RelativePath("world")
         let N = 100000
@@ -28,7 +29,6 @@ class PathPerfTests: XCTestCasePerf {
             }
             XCTAssertEqual(lengths, (absPath.pathString.utf8.count + 1 + relPath.pathString.utf8.count) &* N)
         }
+      #endif
     }
-    
-    // FIXME: We will obviously want a lot more tests here.
 }

Tests/TSCBasicPerformanceTests/SHA256PerfTests.swift

@@ -15,6 +15,7 @@ import TSCTestSupport
 
 class SHA256PerfTests: XCTestCasePerf {
     func test20MBDigest_X1000() {
+      #if os(macOS)
         let sha256 = SHA256()
         let byte = "f"
         let stream = BufferedOutputByteStream()
@@ -26,5 +27,6 @@ class SHA256PerfTests: XCTestCasePerf {
                 XCTAssertEqual(sha256.hash(stream.bytes).hexadecimalRepresentation, "23d00697ba26b4140869bab958431251e7e41982794d41b605b6a1d5dee56abf")
             }
         }
+      #endif
     }
 }

Tests/TSCBasicPerformanceTests/SortedArrayPerfTests.swift

@@ -13,15 +13,18 @@ import TSCTestSupport
 
 class SortedArrayPerfTests: XCTestCasePerf {
     func testPerformanceOfSortedArrayInAscendingOrder() {
+      #if os(macOS)
         measure() {
             var arr = SortedArray<Int>(areInIncreasingOrder: <)
             for i in 1...200_000 {
                 arr.insert(i)
             }
         }
+      #endif
     }
 
     func testPerformanceOfSortedArrayInsertWithDuplicates() {
+      #if os(macOS)
         let initial = SortedArray<Int>(0..<80_000, areInIncreasingOrder: <)
 
         measure() {
@@ -30,18 +33,22 @@ class SortedArrayPerfTests: XCTestCasePerf {
                 arr.insert(element)
             }
         }
+      #endif
     }
 
     func testPerformanceOfSortedArrayInsertContentsOfWithDuplicates() {
+      #if os(macOS)
         let initial = SortedArray<Int>(0..<120_000, areInIncreasingOrder: <)
 
         measure() {
             var arr = initial
             arr.insert(contentsOf: 60_000..<180_000)
         }
+      #endif
     }
 
     func testPerformanceOfSmallSortedArrayInsertContentsOfWithDuplicates() {
+      #if os(macOS)
         let initial = SortedArray<Int>(0..<100, areInIncreasingOrder: <)
 
         measure() {
@@ -50,5 +57,6 @@ class SortedArrayPerfTests: XCTestCasePerf {
                 arr.insert(contentsOf: 50..<150)
             }
         }
+      #endif
     }
 }