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

Fix integration tests waiting for binaries to finish. #7394

Merged
merged 1 commit into from
Sep 20, 2019

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Sep 20, 2019

Integration tests were waiting for binaries to finish building due to a minor
logic error.

Fixes #7393

Integration tests were waiting for binaries to finish building due to a minor
logic error.
@rust-highfive
Copy link

r? @Eh2406

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 20, 2019
@Eh2406
Copy link
Contributor

Eh2406 commented Sep 20, 2019

Should we add a test of some kind?

@alexcrichton
Copy link
Member

@bors: r+

Nah I think this is fine to land without a test, in general it's really hard to test something like this. We could set things up with procedural macros and make sure they're both hit concurrently instead of in sequence, but that would be a pretty complicated test and we don't necessarily change this part of the code often enough to warrant it.

@bors
Copy link
Collaborator

bors commented Sep 20, 2019

📌 Commit 2e9c47b has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 20, 2019
bors added a commit that referenced this pull request Sep 20, 2019
Fix integration tests waiting for binaries to finish.

Integration tests were waiting for binaries to finish building due to a minor
logic error.

Fixes #7393
@bors
Copy link
Collaborator

bors commented Sep 20, 2019

⌛ Testing commit 2e9c47b with merge 023a082...

@bors
Copy link
Collaborator

bors commented Sep 20, 2019

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 023a082 to master...

@bors bors merged commit 2e9c47b into rust-lang:master Sep 20, 2019
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 24, 2019
11 commits in b6c6f685b38d523580813b0031677c2298f458ea..aa6b7e01abce30091cc594cb23a15c46cead6e24
2019-09-19 21:10:09 +0000 to 2019-09-24 17:19:12 +0000
- Fix interpretation of `--features a b` on the CLI (rust-lang/cargo#7419)
- Update env_logger requirement from 0.6.0 to 0.7.0 (rust-lang/cargo#7422)
- Update some unstable docs (rust-lang/cargo#7407)
- Fix xcompile tests. (rust-lang/cargo#7408)
- -Ztimings: Fix more scale problems. (rust-lang/cargo#7403)
- Fix some rendering issues with -Ztimings. (rust-lang/cargo#7397)
- -Ztimings: show max jobs/cpus (rust-lang/cargo#7398)
- Fix -Ztimings with doc tests. (rust-lang/cargo#7395)
- Add documentation for the -Zdoctest-xcompile feature (rust-lang/cargo#7391)
- Fix integration tests waiting for binaries to finish. (rust-lang/cargo#7394)
- Extract Platform to a separate crate. (rust-lang/cargo#7375)
bors added a commit that referenced this pull request Sep 24, 2019
[beta] Backport two changes to 1.39.0

This is a backport of:

* #7394
* #7419
Centril added a commit to Centril/rust that referenced this pull request Sep 25, 2019
…tsakis

Update cargo

11 commits in b6c6f685b38d523580813b0031677c2298f458ea..aa6b7e01abce30091cc594cb23a15c46cead6e24
2019-09-19 21:10:09 +0000 to 2019-09-24 17:19:12 +0000
- Fix interpretation of `--features a b` on the CLI (rust-lang/cargo#7419)
- Update env_logger requirement from 0.6.0 to 0.7.0 (rust-lang/cargo#7422)
- Update some unstable docs (rust-lang/cargo#7407)
- Fix xcompile tests. (rust-lang/cargo#7408)
- -Ztimings: Fix more scale problems. (rust-lang/cargo#7403)
- Fix some rendering issues with -Ztimings. (rust-lang/cargo#7397)
- -Ztimings: show max jobs/cpus (rust-lang/cargo#7398)
- Fix -Ztimings with doc tests. (rust-lang/cargo#7395)
- Add documentation for the -Zdoctest-xcompile feature (rust-lang/cargo#7391)
- Fix integration tests waiting for binaries to finish. (rust-lang/cargo#7394)
- Extract Platform to a separate crate. (rust-lang/cargo#7375)
@ehuss ehuss modified the milestones: 1.40.0, 1.39.0 Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

dep graph: test and binary targets can be build in parallel
5 participants