[swift-refactor] When testing always specify a resource-dir #39147
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
This lets one customize in the compiler invocation where the compiler looks for the stdlib. This is necessary if the toolchain is not using a stdlib installed with it.
|
@swift-ci test |
benlangmuir
reviewed
Sep 2, 2021
| @@ -396,7 +396,7 @@ if test_sdk_overlay_dir is not None: | |||
| "-L %s -Xlinker -rpath -Xlinker %s" % | |||
| (sdk_overlay_link_path_dir, sdk_overlay_link_path_dir)) | |||
| lit_config.note('Using SDK overlay dir: ' + test_sdk_overlay_dir) | |||
| resource_dir_opt += (" %s" % sdk_overlay_dir_opt) | |||
| config.resource_dir_opt += (" %s" % sdk_overlay_dir_opt) | |||
There was a problem hiding this comment.
These tools (swift-ide-test, swift-refactor, sourcekitd-test) have a different CLI than the driver, and only handle certain options. I suggest we split this -L %s -Xlinker -rpath -Xlinker %s ... into a separate variable in lit so that we can pass only -resource-dir %s to these tools.
There was a problem hiding this comment.
Ok. I can fix this in a follow on PR. It isn't directly related to this.
ahoppen
reviewed
Sep 3, 2021
| if test_resource_dir: | ||
| resource_dir_opt = ("-resource-dir %s" % test_resource_dir) | ||
| config.resource_dir_opt = ("-resource-dir %s" % test_resource_dir) |
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.
Otherwise, swift-refactor always assumes the stdlib is shipped with it. This is not true when doing a stage 2 stdlib build.