[5.2] [sourcekit] Add global -module-cache-path to test executables #29547
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
Add a global -module-cache-path option to `sourcekitd-test` and `complete-test` and have lit provide the default module cache in its substitutions. Previously many tests have explicitly provided the `%mcp_opt` option, but this is easy to forget when writing new tests. The module cache is inserted into the compiler arguments at the beginning so that it's still possible for a test to override it with a per-test cache if desired. rdar://58752842
Remove `%mcp_opt` from commands that use `%sourcekitd-test` and `%complete-test`, as they are now redundant with the lit substitution. Conflicts: test/SourceKit/CursorInfo/cursor_info.swift
When doing header interface generation, we interpret clang command-line arguments in `initInvocationByClangArguments` and attempt to setup a matching Swift compiler invocation. One important argument is the module cache, but clang will only interpret `-fmodules-cache-path` if modules are enabled (typically with `-fmodules`). While the header itself might not need modules, Swift will import its own shims module and during testing this needs to honour lit's provided cache. So we add -fmodules in sourcekitd-test anytime we add -fmodules-cache-path. rdar://58836540
@swift-ci please nominate |
|
@swift-ci please test |
|
Update: we believe we found the change that triggered this set of failures, and fixed it in #29556. That being said, I would still like to make this change, since it makes the tests more robust against module-cache-related problems in general, particularly during local development where we do not detect the format changes reliably. It also helps avoid merge conflicts between master and 5.2 because it touches a lot of test invocations. |
akyrtzi
approved these changes
Feb 3, 2020
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.
Cherry-pick #29357 to swift-5.2-branch
Add a global -module-cache-path option to sourcekitd-test and
complete-test and have lit provide the default module cache in its
substitutions. Previously many tests have explicitly provided the
%mcp_opt option, but this is easy to forget when writing new tests.
The module cache is inserted into the compiler arguments at the
beginning so that it's still possible for a test to override it with a
per-test cache if desired.
rdar://58959228