Skip to content

Fix cargotest #32786

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

Merged
merged 1 commit into from
Apr 9, 2016
Merged

Fix cargotest #32786

merged 1 commit into from
Apr 9, 2016

Conversation

brson
Copy link
Contributor

@brson brson commented Apr 7, 2016

Tested in dev.

@brson
Copy link
Contributor Author

brson commented Apr 7, 2016

r? @alexcrichton

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@alexcrichton
Copy link
Member

@bors: r+ d23be87

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 7, 2016
bors added a commit that referenced this pull request Apr 7, 2016
Rollup of 11 pull requests

- Successful merges: #32016, #32583, #32699, #32729, #32731, #32738, #32741, #32745, #32748, #32757, #32786
- Failed merges: #32773
@brson
Copy link
Contributor Author

brson commented Apr 7, 2016

@alexcrichton re-r? I made cargotest depend on librustctest because cargo's test suite is looking for librustc_plugins. I swear this is the secret ingredient that will make it all work. Untested ;)

@alexcrichton
Copy link
Member

Oh right yeah we have some tests that exercise plugins. This means we can't submit a breaking change to plugins without changing upstream Cargo but... I guess that's not too bad?

@bors: r+

@bors
Copy link
Collaborator

bors commented Apr 7, 2016

📌 Commit 8019922 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Apr 9, 2016

⌛ Testing commit 8019922 with merge 526f2bf...

bors added a commit that referenced this pull request Apr 9, 2016
@alexcrichton
Copy link
Member

Everything passed except android which disappeared again unfortunately, so merging manually.

@alexcrichton alexcrichton merged commit 8019922 into rust-lang:master Apr 9, 2016
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants