[lldb/test] Fix Swift testsuite environemnt #995
Merged
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
We have tried chaging `LLDB_SWIFT_LIBS` in `test/API/CMakelists.txt` before to point it to a directory that actually contains the just built runtime libraries. Unfortunately, `LLDB_SWIFT_LIBS` is a cache variable that gets passed by `build-script`, so this change has no effect. Instead, add `macosx` to the uses of the variable. For `LD_LIBRARY_PATH`, which is used on non-darwin systems, use `CMAKE_SYSTEM_PROCESSOR` instead which is what the Swift test code seems to be doing. This also fixed the same issue in the Shell tests.
|
@swift-ci test |
JDevlieghere
approved these changes
Mar 29, 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.
We have tried chaging
LLDB_SWIFT_LIBSintest/API/CMakelists.txtbeforeto point it to a directory that actually contains the just built runtime
libraries. Unfortunately,
LLDB_SWIFT_LIBSis a cache variable that getspassed by
build-script, so this change has no effect.Instead, add
macosxto the uses of the variable. ForLD_LIBRARY_PATH,which is used on non-darwin systems, use
CMAKE_SYSTEM_PROCESSORinsteadwhich is what the Swift test code seems to be doing.
This also fixed the same issue in the Shell tests.