Skip to content

[rebranch] Fix async-args.swift #40447

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
Dec 7, 2021

Conversation

bnbarham
Copy link
Contributor

@bnbarham bnbarham commented Dec 7, 2021

This was a bit of a confusing one caused by stable/20211026 missing commits. test/DebugInfo/async-args.swift was updated in 2a74582 but since the corresponding LLVM change was missing, this was causing failures on rebranch. It was thus mostly reverted, which now causes a failure since the LLVM change is back.

Cherry-pick the actual previous update to fix the test (again).

@bnbarham
Copy link
Contributor Author

bnbarham commented Dec 7, 2021

@swift-ci please test

@bnbarham
Copy link
Contributor Author

bnbarham commented Dec 7, 2021

It's likely we'll still get a failing build because of the racy async test, but we're just looking for test/DebugInfo/async-args.swift to pass.

@adrian-prantl sorry about the mess here - I had previously assumed this test was failing due to a bad merge, but it was in fact because were missing all those commits from stable/20211026. It should now be what's on main.

@swift-ci
Copy link
Contributor

swift-ci commented Dec 7, 2021

Build failed
Swift Test Linux Platform
Git Sha - a4f8c19

@swift-ci
Copy link
Contributor

swift-ci commented Dec 7, 2021

Build failed
Swift Test OS X Platform
Git Sha - a4f8c19

@bnbarham
Copy link
Contributor Author

bnbarham commented Dec 7, 2021

Swift tests all passed, LLDB issue is fixed in swiftlang/llvm-project#3635

Copy link
Contributor

@adrian-prantl adrian-prantl left a comment

Choose a reason for hiding this comment

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

This seems plausible; the LLDB end-to-end tests will tell the ultimate truth.

@bnbarham bnbarham merged commit fe7e169 into swiftlang:rebranch Dec 7, 2021
@bnbarham bnbarham deleted the rebranch-test-fix branch December 7, 2021 22:46
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.

3 participants