mirror of
https://github.com/rust-lang/cargo
synced 2024-10-14 03:32:39 +00:00
Fix bug with -Zfeatures=dev_dep and check --profile=test
.
This commit is contained in:
parent
7dec94d387
commit
b112255f37
|
@ -608,16 +608,18 @@ impl CompileFilter {
|
||||||
pub fn need_dev_deps(&self, mode: CompileMode) -> bool {
|
pub fn need_dev_deps(&self, mode: CompileMode) -> bool {
|
||||||
match mode {
|
match mode {
|
||||||
CompileMode::Test | CompileMode::Doctest | CompileMode::Bench => true,
|
CompileMode::Test | CompileMode::Doctest | CompileMode::Bench => true,
|
||||||
CompileMode::Build | CompileMode::Doc { .. } | CompileMode::Check { .. } => match *self
|
CompileMode::Check { test: true } => true,
|
||||||
{
|
CompileMode::Build | CompileMode::Doc { .. } | CompileMode::Check { test: false } => {
|
||||||
CompileFilter::Default { .. } => false,
|
match *self {
|
||||||
CompileFilter::Only {
|
CompileFilter::Default { .. } => false,
|
||||||
ref examples,
|
CompileFilter::Only {
|
||||||
ref tests,
|
ref examples,
|
||||||
ref benches,
|
ref tests,
|
||||||
..
|
ref benches,
|
||||||
} => examples.is_specific() || tests.is_specific() || benches.is_specific(),
|
..
|
||||||
},
|
} => examples.is_specific() || tests.is_specific() || benches.is_specific(),
|
||||||
|
}
|
||||||
|
}
|
||||||
CompileMode::RunCustomBuild => panic!("Invalid mode"),
|
CompileMode::RunCustomBuild => panic!("Invalid mode"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1108,3 +1108,80 @@ fn proc_macro_ws() {
|
||||||
.with_stderr_line_without(&["[RUNNING] `rustc --crate-name foo"], &["--cfg[..]feat1"])
|
.with_stderr_line_without(&["[RUNNING] `rustc --crate-name foo"], &["--cfg[..]feat1"])
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cargo_test]
|
||||||
|
fn has_dev_dep_for_test() {
|
||||||
|
// Check for a bug where the decision on whether or not "dev dependencies"
|
||||||
|
// should be used did not consider `check --profile=test`.
|
||||||
|
let p = project()
|
||||||
|
.file(
|
||||||
|
"Cargo.toml",
|
||||||
|
r#"
|
||||||
|
[package]
|
||||||
|
name = "foo"
|
||||||
|
version = "0.1.0"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
dep = { path = 'dep', features = ['f1'] }
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.file(
|
||||||
|
"src/lib.rs",
|
||||||
|
r#"
|
||||||
|
#[test]
|
||||||
|
fn t1() {
|
||||||
|
dep::f();
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.file(
|
||||||
|
"dep/Cargo.toml",
|
||||||
|
r#"
|
||||||
|
[package]
|
||||||
|
name = "dep"
|
||||||
|
version = "0.1.0"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
f1 = []
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.file(
|
||||||
|
"dep/src/lib.rs",
|
||||||
|
r#"
|
||||||
|
#[cfg(feature = "f1")]
|
||||||
|
pub fn f() {}
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
p.cargo("check -v")
|
||||||
|
.with_stderr(
|
||||||
|
"\
|
||||||
|
[CHECKING] foo v0.1.0 [..]
|
||||||
|
[RUNNING] `rustc --crate-name foo [..]
|
||||||
|
[FINISHED] [..]
|
||||||
|
",
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
p.cargo("check -v --profile=test -Zfeatures=dev_dep")
|
||||||
|
.masquerade_as_nightly_cargo()
|
||||||
|
.with_stderr(
|
||||||
|
"\
|
||||||
|
[CHECKING] dep v0.1.0 [..]
|
||||||
|
[RUNNING] `rustc --crate-name dep [..]
|
||||||
|
[CHECKING] foo v0.1.0 [..]
|
||||||
|
[RUNNING] `rustc --crate-name foo [..]
|
||||||
|
[FINISHED] [..]
|
||||||
|
",
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
p.cargo("check -v --profile=test")
|
||||||
|
.with_stderr(
|
||||||
|
"\
|
||||||
|
[FRESH] dep [..]
|
||||||
|
[FRESH] foo [..]
|
||||||
|
[FINISHED] [..]
|
||||||
|
",
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue