[test] Handle architecture aliasing for OpenBSD. #32363
Merged
Conversation
This file contains 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
Swift calls the architecture x86_64, OpenBSD calls it amd64. If we use run_cpu in lit.cfg as-is, then we may need to duplicate lines in each test for 'x86_64' and 'amd64', which puts a maintenance burden on unit test developers to ensure they are duplicating changes to each line. Instead, alias 'amd64' to 'x86_64' for `run_cpu`, but keep the platform module path referring to 'amd64', in order to distinguish the target architecture name and the Swift architecture name. This is particularly relevant for the %target-.*-name pseudovariables used, which should reference the Swift architecture names. However, some unit tests are directly referencing %target-cpu directly, which would break the aliasing. This is done only for swiftinterface files, so a new substitution is defined in lit.cfg for these variables, and the affected unit test cases are migrated.
|
grumble why is there no standard naming for architectures? amd64 vs x86_64; arm64 vs aarch64. Thanks for fixing this in a generic way. |
|
@swift-ci please test |
|
@swift-ci please test Windows platform |
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.
Swift calls the architecture x86_64, OpenBSD calls it amd64. If we use
run_cpu in lit.cfg as-is, then we may need to duplicate lines in each
test for 'x86_64' and 'amd64', which puts a maintenance burden on unit
test developers to ensure they are duplicating changes to each line.
Instead, alias 'amd64' to 'x86_64' for
run_cpu, but keep the platformmodule path referring to 'amd64', in order to distinguish the target
architecture name and the Swift architecture name. This is particularly
relevant for the %target-.*-name pseudovariables used, which should
reference the Swift architecture names.
However, some unit tests are directly referencing %target-cpu directly,
which would break the aliasing. This is done only for swiftinterface
files, so a new substitution is defined in lit.cfg for these variables,
and the affected unit test cases are migrated.