Skip to content

Commit 047a408

Browse files
committed
Add and fix missing Triple tests, fix soundness checks
Cherry-pick of #6842. Vendored Swift Driver triple was not checked against a few tests that weren't brought over from TSC after `TSC.Triple` type was deprecated. We should fix those tests, especially as they verified that per-component equality for triples worked instead of the current string-based equality check. Also fixed `Utilities/soundness.sh` script failures. (cherry picked from commit 2cdc604) ``` # Conflicts: # Tests/BasicsTests/FileSystem/PathShimTests.swift # Tests/BasicsTests/FileSystem/PathTests.swift ```
1 parent df48749 commit 047a408

File tree

5 files changed

+1905
-1889
lines changed

5 files changed

+1905
-1889
lines changed

Sources/Basics/Triple+Basics.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,11 @@ extension Triple: CustomStringConvertible {
193193
}
194194

195195
extension Triple: Equatable {
196-
public static func == (lhs: Self, rhs: Self) -> Bool {
197-
lhs.triple == rhs.triple
196+
public static func ==(lhs: Triple, rhs: Triple) -> Bool {
197+
lhs.arch == rhs.arch
198+
&& lhs.vendor == rhs.vendor
199+
&& lhs.os == rhs.os
200+
&& lhs.environment == rhs.environment
201+
&& lhs.osVersion == rhs.osVersion
198202
}
199203
}

0 commit comments

Comments
 (0)