Skip to content

Commit

Permalink
Auto merge of #8713 - ehuss:filters_target-cross, r=alexcrichton
Browse files Browse the repository at this point in the history
Add cross check to filters_target test.

This test requires a cross compiler target to be installed, so disable it if it is not.
  • Loading branch information
bors committed Sep 18, 2020
2 parents e4b65bd + 8ee908d commit d8c8548
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tests/testsuite/tree.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Tests for the `cargo tree` command.

use cargo_test_support::cross_compile::alternate;
use cargo_test_support::cross_compile::{self, alternate};
use cargo_test_support::registry::{Dependency, Package};
use cargo_test_support::{basic_manifest, git, project, rustc_host, Project};

Expand Down Expand Up @@ -324,6 +324,9 @@ a v0.1.0 ([..]/foo)
#[cargo_test]
fn filters_target() {
// --target flag
if cross_compile::disabled() {
return;
}
Package::new("targetdep", "1.0.0").publish();
Package::new("hostdep", "1.0.0").publish();
Package::new("devdep", "1.0.0").publish();
Expand Down

0 comments on commit d8c8548

Please sign in to comment.