Skip to content

Commit 2cdc604

Browse files
committed
Add and fix missing Triple tests, fix soundness checks
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.
1 parent 667a006 commit 2cdc604

File tree

7 files changed

+1944
-1923
lines changed

7 files changed

+1944
-1923
lines changed

Sources/Basics/Triple+Basics.swift

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

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

0 commit comments

Comments
 (0)