Skip to content
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

Use get_python_lib to look for lldb python lib dir. #7685

Merged
merged 2 commits into from Feb 23, 2017

Conversation

gmilos
Copy link
Contributor

@gmilos gmilos commented Feb 22, 2017

Fedora builds are currently failing due to https://github.com/apple/swift/blob/202ee90b5d62c55582cc451c0ea2854a0f6a4cca/test/Runtime/linux-fatal-backtrace.swift failing to find the lldb bindings in lldb-python-path.

Prerequisite to resolve SR-100.

@alblue
Copy link
Contributor

alblue commented Feb 22, 2017

@swift-ci please test

@gmilos
Copy link
Contributor Author

gmilos commented Feb 22, 2017

@rintaro @modocache Hi, you both helped to review the original change that introduced this functionality + test. Could you review the above PR?

Background: Attempts to make Swift build Fedora is currently hitting issues where _lldb.so end up in different dir (lib64 vs lib) and aren't correctly located by the test. Full discussion on SR-100.

@rintaro
Copy link
Member

rintaro commented Feb 23, 2017

The change itself LGTM.
But, I still think #4479 (comment)
Mind moving this to lit.cfg?

@alblue
Copy link
Contributor

alblue commented Feb 23, 2017

@swift-ci please smoke test

@@ -34,6 +34,7 @@ config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"

config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
config.lldb_build_root = "@LLDB_BUILD_DIR@"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, we need this line in validation-test/lit.site.cfg.in too. Otherwise,

  File "/home/rintaro/Documents/swift-oss/swift/test/lit.cfg", line 1073, in <module>
    if config.lldb_build_root != "":
AttributeError: TestingConfig instance has no attribute 'lldb_build_root'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, fixed that already, thanks.

@gmilos gmilos force-pushed the sr-100-lit-python-search-path branch from f4cc383 to e07eb41 Compare February 23, 2017 16:36
@alblue
Copy link
Contributor

alblue commented Feb 23, 2017

@swift-ci please smoke test

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.

None yet

3 participants