Skip to content
New issue

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

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

Already on GitHub? # to your account

debuginfo-test: Fix #45086. #45091

Merged
merged 1 commit into from
Oct 10, 2017
Merged

debuginfo-test: Fix #45086. #45091

merged 1 commit into from
Oct 10, 2017

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Oct 7, 2017

Fixes #45086, where all debuginfo-lldb fails when using LLDB from Xcode 9.

LLDB's output may be None instead of '', and that will cause type
mismatch when normalize_whitespace() expects a string instead of
None. This commit simply ensures we do pass '' even if the output
is None.
@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@k0pernicus
Copy link
Contributor

Thank you for this PR @kennytm - got this problem yesterday actually.
It works well now!

@michaelwoerister
Copy link
Member

@bors r+

Thank you so much, @kennytm!

@bors
Copy link
Contributor

bors commented Oct 9, 2017

📌 Commit 07b1899 has been approved by michaelwoerister

@michaelwoerister
Copy link
Member

@bors rollup

@carols10cents carols10cents added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 9, 2017
kennytm added a commit to kennytm/rust that referenced this pull request Oct 9, 2017
debuginfo-test: Fix rust-lang#45086.

Fixes rust-lang#45086, where all debuginfo-lldb fails when using LLDB from Xcode 9.
bors added a commit that referenced this pull request Oct 10, 2017
Rollup of 9 pull requests

- Successful merges: #44962, #45051, #45091, #45106, #45117, #45118, #45120, #45125, #45136
- Failed merges:
@bors bors merged commit 07b1899 into rust-lang:master Oct 10, 2017
@kennytm kennytm deleted the fix-45086 branch October 10, 2017 12:01
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants