Skip to content

Commit

Permalink
Auto merge of #7394 - ehuss:fix-bin-edge, r=alexcrichton
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Sep 20, 2019
2 parents 7ab4778 + 2e9c47b commit 023a082
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/job_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ impl<'a, 'cfg> JobQueue<'a, 'cfg> {
.filter(|unit| {
// Binaries aren't actually needed to *compile* tests, just to run
// them, so we don't include this dependency edge in the job graph.
!unit.target.is_test() || !unit.target.is_bin()
!unit.target.is_test() && !unit.target.is_bin()
})
.map(|dep| {
// Handle the case here where our `unit -> dep` dependency may
Expand Down

0 comments on commit 023a082

Please sign in to comment.