lit.cfg: move the DYLD_LIBRARY_PATH setting code to the config.substitutions #23996
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
Author
| @swift-ci Please smoke test and merge |
compnerd reviewed Apr 12, 2019
test/lit.cfg Outdated
Member
There was a problem hiding this comment.
would be nice to sink this into the single use below to avoid this value being left around since the name is unclear whether it is static or dynamic.
Author
There was a problem hiding this comment.
I kept it separate but changed the name to make it clear that it is static.
compnerd reviewed Apr 12, 2019
test/lit.cfg Outdated
Member
There was a problem hiding this comment.
This will break the Windows test suite.
Author
There was a problem hiding this comment.
I am unfamiliar with the Windows test suite, from what I can gather the windows environment variable is PATH? Changed the PR accordingly.
Author
There was a problem hiding this comment.
Changing PATH is not a good idea. I am gonna enable this change just on non-windows platforms for now.
…tutions This change the order the configuration file to something that makes more sense: the platform_module_dir value was being set in the middle of the config.substitutions phase. We needed said value for setting the DYLD_LIBRARY_PATH, so that code was added right after it. The problem is that by that time config.substitutions.append(('%target-run', config.target_run)) has already happened for local targets This change moves all said code to just before the substitutions phase, much cleaner and resolves rdar://problem/49835064 Author
| @swift-ci Please smoke test and merge |
Author
| On Linux |
Author
| @swift-ci Please smoke test linux |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
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 change the order the configuration file to something that makes more sense: the platform_module_dir value was being set in the middle of the config.substitutions phase.
We needed said value for setting the DYLD_LIBRARY_PATH, so that code was added right after it.
The problem is that by that time config.substitutions.append(('%target-run', config.target_run)) has already happened for local targets
This change moves all said code to just before the substitutions phase, much cleaner and resolves rdar://problem/49835064