Skip to content

Conversation

MaxDesiatov
Copy link
Contributor

@MaxDesiatov MaxDesiatov commented Sep 20, 2023

Cherry-pick of #6843

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.

(cherry picked from commit 8de70d3)

# Conflicts:
#	Tests/BasicsTests/TripleTests.swift

Related to rdar://113967401
May be related to rdar://115731621

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov MaxDesiatov changed the title Fix optionality issues after revert [5.10] Add and fix missing Triple tests Sep 20, 2023
@@ -239,53 +239,6 @@ extension Triple {
}
}

// The Darwin platform version used for linking.
public var darwinLinkerPlatformVersion: Version {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed as unused, previously it was incorrectly used as a substitute for nil where Triple.Version should've been optional in the first place.

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov MaxDesiatov added the swift 5.10 This PR targets the 5.10 branch label Sep 20, 2023
@MaxDesiatov MaxDesiatov changed the title [5.10] Add and fix missing Triple tests [5.10] Add and fix missing Triple tests Sep 20, 2023
@neonichu
Copy link
Contributor

Failure looks real

[1041/1158] Compiling Basics Triple+Basics.swift
/home/build-user/swiftpm/Sources/Basics/Triple+Basics.swift:194:35: error: binary operator '>=' cannot be applied to two 'Triple.Version?' operands
            return self.osVersion >= triple.osVersion
                   ~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~

(cherry picked from commit 8de70d3)

# Conflicts:
#	Tests/BasicsTests/TripleTests.swift
(cherry picked from commit cfb7836)
(cherry picked from commit 0ab5eab)

# Conflicts:
#	Tests/BasicsTests/TripleTests.swift
#	Utilities/soundness.sh
@MaxDesiatov MaxDesiatov force-pushed the maxd/fix-triple-soundness-5.10 branch from 469e858 to f73e80f Compare September 20, 2023 16:57
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov MaxDesiatov enabled auto-merge (squash) September 20, 2023 19:10
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test windows

@MaxDesiatov MaxDesiatov merged commit 1785297 into release/5.10 Sep 20, 2023
@MaxDesiatov MaxDesiatov deleted the maxd/fix-triple-soundness-5.10 branch September 20, 2023 21:18
MaxDesiatov added a commit that referenced this pull request Sep 28, 2023
Cherry-pick of #6843

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.

(cherry picked from commit 8de70d3)

```
# Conflicts:
#	Tests/BasicsTests/TripleTests.swift
```

Related to rdar://113967401
Maybe related to rdar://115731621
MaxDesiatov added a commit that referenced this pull request Sep 28, 2023
Cherry-pick of #6843

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.

(cherry picked from commit 8de70d3)

```
# Conflicts:
#	Tests/BasicsTests/TripleTests.swift
```

Related to rdar://113967401
Maybe related to rdar://115731621
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cross-compilation swift 5.10 This PR targets the 5.10 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants