Skip to content

Fix Reproducer/TestDriverOptions.test in swift/master #435

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 9, 2019

Conversation

vedantk
Copy link

@vedantk vedantk commented Dec 9, 2019

No description provided.

@vedantk vedantk requested a review from JDevlieghere December 9, 2019 18:16
@vedantk
Copy link
Author

vedantk commented Dec 9, 2019

@swift-ci test

@JDevlieghere
Copy link

Thanks!

@vedantk
Copy link
Author

vedantk commented Dec 9, 2019

@JDevlieghere heads-up, I tried cherry-picking this to swift/master-next, but the test is not present there. I guess that's just due to the swift/master -> swift/master-next automerger being down?

@JDevlieghere
Copy link

@vedantk There is no automerger from swift/master -> swift/master-next in the monorepo. The test should be there though, but probably under test/Shell rather than lit?

@vedantk vedantk merged commit 86014b2 into swiftlang:swift/master Dec 9, 2019
@vedantk
Copy link
Author

vedantk commented Dec 9, 2019

@JDevlieghere The test is present under test/Shell, but it looks substantially different. Should we tackle this in the rebranch or now?

@JDevlieghere
Copy link

Right, totally my fault, I don't think I cherry-picked the swift-only change from master to master-next, sorry. I'll do that right now.

@JDevlieghere
Copy link

Pushed it

To github.com:apple/llvm-project.git
   c07e3062960a..ed5aace8b9a6  swift/master-next -> swift/master-next

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