Skip to content

[lldb/test] Fix Swift testsuite environemnt #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 29, 2020

Conversation

fredriss
Copy link

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.

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.
@fredriss fredriss requested a review from JDevlieghere March 29, 2020 16:18
@fredriss
Copy link
Author

@swift-ci test

@fredriss fredriss merged commit bd76300 into swiftlang:swift/master Mar 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants