[swift-stage2] Point the API migrator at the correct directory when building/testing against a host toolchain. #38846
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
|
@swift-ci smoke test |
benlangmuir
approved these changes
Aug 11, 2021
test/lit.cfg
Outdated
| api_diff_data_dir_flag = '' | ||
| if config.testing_against_host_compiler: | ||
| migrator_dir = os.path.join(os.path.dirname(config.swiftc), | ||
| '..', 'lib', 'swift', 'migrator') |
There was a problem hiding this comment.
I was going to suggest:
os.path.join(config.swift_lib_dir, 'swift', 'migrator')But I'm not actually sure if that's correct when testing against the host toolchain 🤔
There was a problem hiding this comment.
Yes. The swift lib dir is going to be where the newly built stdlib is I think. We want to be 100% sure it is the toolchain and swiftc is always going to be in the toolchain so I think it is reasonable.
gottesmm
force-pushed
the
pr-36215dc624bd0eff08ab502b119618f819699467
branch
from
b6cd0e9 to
302dc9f
Compare
…uilding/testing against a host toolchain. This involved adding a new substitution called %api_diff_data_dir that when building against a host toolchain, looks in the host toolchain (next to swiftc) rather than in the resource dir. The reason why I need to do this is this allows me to perform a stdlib stage2 build without needing to build swift itself. The only interesting changes here are that I had to add %api_diff_data_dir to a bunch of normal/expected tests and also add %api_diff_data_dir's length to the offsets in rdar31892850.swift.
gottesmm
force-pushed
the
pr-36215dc624bd0eff08ab502b119618f819699467
branch
from
302dc9f to
af25b67
Compare
|
@swift-ci smoke test |
|
@swift-ci 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.
This involved adding a new substitution called %api_diff_data_dir that when
building against a host toolchain, looks in the host toolchain (next to swiftc)
rather than in the resource dir. The reason why I need to do this is this allows
me to perform a stdlib stage2 build without needing to build swift itself.
The only interesting changes here are that I had to add %api_diff_data_dir to
a bunch of normal/expected tests and also add %api_diff_data_dir's length to the
offsets in rdar31892850.swift.