[test] Check LD_LIBRARY_PATH a little less strictly. #2976
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
LD_LIBRARY_PATH is one of the few environment variables the LLVM 'lit' tool /doesn't/ strip out, presumably because on some Linux systems it's necessary to run some of the built products being tested. However, the Swift driver also uses LD_LIBRARY_PATH when providing -L options to the script interpreter on Linux. Weaken some of our tests when there's an LD_LIBRARY_PATH in the environment. (There are similar environment variables on OS X, but we don't have to do anything special there because lit /does/ strip those out. This is presumably okay because all of LLVM's load-time dependencies on OS X are in standard system locations.) https://bugs.swift.org/browse/SR-813
|
@modocache, does this seem like a reasonable workaround? I mocked up the original situation on OS X and this does seem to fix it. @swift-ci Please test |
|
Some other potential Linux reviewers: @hpux735, @rintaro, @gribozavr. |
|
Seems like a fine solution to me! Also /cc @mikehenson, who reported SR-813. |
|
I'll compile and test on ARM momentarily, but I don't anticipate any issues. |
|
LGTM, waiting for @hpux735. |
|
Go ahead and merge. There's something else wrong with testing on ARM, and I don't want to hold this up. |
|
@hpux735 Thanks! |
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.
LD_LIBRARY_PATHis one of the few environment variables the LLVM 'lit' tool doesn't strip out, presumably because on some Linux systems it's necessary to run some of the built products being tested. However, the Swift driver also usesLD_LIBRARY_PATHwhen providing-Loptions to the script interpreter on Linux. Weaken some of our tests when there's anLD_LIBRARY_PATHin the environment.(There are similar environment variables on OS X, but we don't have to do anything special there because lit does strip those out. This is presumably okay because all of LLVM's load-time dependencies on OS X are in standard system locations.)
Fixes SR-813.
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.