Get Android to parity with upstream driver and enable remaining tests #720
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
finagolfin
commented
Jun 19, 2021
| @@ -1808,6 +1808,31 @@ final class SwiftDriverTests: XCTestCase { | |||
| } | |||
| #endif | |||
There was a problem hiding this comment.
These linux tests above are disabled on linux, mistake or deliberate decision?
There was a problem hiding this comment.
It looks like they are enabled, only on Linux?
There was a problem hiding this comment.
See the enclosing #if os(macOS) conditional compile at the top of this test.
finagolfin
commented
Jun 19, 2021
| @@ -105,6 +105,7 @@ import TSCBasic | |||
| targetTriple: Triple, | |||
| isShared: Bool | |||
| ) throws -> String { | |||
| return "libclang_rt.\(sanitizer.libraryName)-\(targetTriple.archName).a" | |||
| let environment = (targetTriple.environment == .android) ? "-android" : "" | |||
| return "libclang_rt.\(sanitizer.libraryName)-\(targetTriple.archName)\(environment).a" | |||
There was a problem hiding this comment.
This is a port of my earlier patch for the C++ driver.
cltnschlosser
approved these changes
Jun 19, 2021
artemcm
approved these changes
Jun 21, 2021
|
I think this just needs to run through the CI and it can be merged? |
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the only remaining Android difference with the C++ driver. The new test was tested natively on Android with my Swift 5.4.1 toolchain package in the Termux app, all tests passed.