Skip to content

Commit 7964e94

Browse files
borsbors
authored
Auto merge of #3125 - mbrubeck:dev-deps, r=alexcrichton
Build transitive dev-dependencies when needed When running `cargo test -p foo` where `foo` is a crate in the current workspace, build and link `foo`'s dev-dependencies. Fixes #860.
2 parents 9b3e219 + bb058d9 commit 7964e94

File tree

5 files changed

+69
-13
lines changed

5 files changed

+69
-13
lines changed

‎src/cargo/ops/cargo_compile.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use std::sync::Arc;
2828

2929
use core::registry::PackageRegistry;
3030
use core::{Source, SourceId, PackageSet, Package, Target};
31-
use core::{Profile, TargetKind, Profiles, Workspace};
31+
use core::{Profile, TargetKind, Profiles, Workspace, PackageIdSpec};
3232
use core::resolver::{Method, Resolve};
3333
use ops::{self, BuildOutput, ExecEngine};
3434
use sources::PathSource;
@@ -97,7 +97,8 @@ pub fn resolve_dependencies<'a>(ws: &Workspace<'a>,
9797
source: Option<Box<Source + 'a>>,
9898
features: Vec<String>,
9999
all_features: bool,
100-
no_default_features: bool)
100+
no_default_features: bool,
101+
spec: &'a [String])
101102
-> CargoResult<(PackageSet<'a>, Resolve)> {
102103

103104
let mut registry = try!(PackageRegistry::new(ws.config()));
@@ -128,9 +129,13 @@ pub fn resolve_dependencies<'a>(ws: &Workspace<'a>,
128129
}
129130
};
130131

132+
let specs = try!(spec.iter().map(|p| PackageIdSpec::parse(p))
133+
.collect::<CargoResult<Vec<_>>>());
134+
131135
let resolved_with_overrides =
132136
try!(ops::resolve_with_previous(&mut registry, ws,
133-
method, Some(&resolve), None));
137+
method, Some(&resolve), None,
138+
&specs));
134139

135140
let packages = ops::get_resolved_packages(&resolved_with_overrides,
136141
registry);
@@ -164,9 +169,8 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>,
164169
try!(generate_targets(root_package, profiles, mode, filter, release));
165170
}
166171

167-
let (packages, resolve_with_overrides) = {
168-
try!(resolve_dependencies(ws, source, features, all_features, no_default_features))
169-
};
172+
let (packages, resolve_with_overrides) =
173+
try!(resolve_dependencies(ws, source, features, all_features, no_default_features, spec));
170174

171175
let mut pkgids = Vec::new();
172176
if spec.len() > 0 {

‎src/cargo/ops/cargo_generate_lockfile.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn generate_lockfile(ws: &Workspace) -> CargoResult<()> {
1919
let mut registry = try!(PackageRegistry::new(ws.config()));
2020
let resolve = try!(ops::resolve_with_previous(&mut registry, ws,
2121
Method::Everything,
22-
None, None));
22+
None, None, &[]));
2323
try!(ops::write_pkg_lockfile(ws, &resolve));
2424
Ok(())
2525
}
@@ -78,7 +78,8 @@ pub fn update_lockfile(ws: &Workspace, opts: &UpdateOptions)
7878
ws,
7979
Method::Everything,
8080
Some(&previous_resolve),
81-
Some(&to_avoid)));
81+
Some(&to_avoid),
82+
&[]));
8283

8384
// Summarize what is changing for the user.
8485
let print_change = |status: &str, msg: String| {

‎src/cargo/ops/cargo_output_metadata.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ fn metadata_full(ws: &Workspace,
4747
None,
4848
opt.features.clone(),
4949
opt.all_features,
50-
opt.no_default_features));
50+
opt.no_default_features,
51+
&[]));
5152
let (packages, resolve) = deps;
5253

5354
let packages = try!(packages.package_ids()

‎src/cargo/ops/resolve.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::collections::{HashMap, HashSet};
22

3-
use core::{PackageId, SourceId, Workspace};
3+
use core::{PackageId, PackageIdSpec, SourceId, Workspace};
44
use core::registry::PackageRegistry;
55
use core::resolver::{self, Resolve, Method};
66
use ops;
@@ -16,7 +16,7 @@ pub fn resolve_ws(registry: &mut PackageRegistry, ws: &Workspace)
1616
let prev = try!(ops::load_pkg_lockfile(ws));
1717
let resolve = try!(resolve_with_previous(registry, ws,
1818
Method::Everything,
19-
prev.as_ref(), None));
19+
prev.as_ref(), None, &[]));
2020

2121
// Avoid writing a lockfile if we are `cargo install`ing a non local package.
2222
if ws.current_opt().map(|pkg| pkg.package_id().source_id().is_path()).unwrap_or(true) {
@@ -38,7 +38,8 @@ pub fn resolve_with_previous<'a>(registry: &mut PackageRegistry,
3838
ws: &Workspace,
3939
method: Method,
4040
previous: Option<&'a Resolve>,
41-
to_avoid: Option<&HashSet<&'a PackageId>>)
41+
to_avoid: Option<&HashSet<&'a PackageId>>,
42+
specs: &[PackageIdSpec])
4243
-> CargoResult<Resolve> {
4344
// Here we place an artificial limitation that all non-registry sources
4445
// cannot be locked at more than one revision. This means that if a git
@@ -67,7 +68,8 @@ pub fn resolve_with_previous<'a>(registry: &mut PackageRegistry,
6768
if let Method::Required { .. } = method {
6869
assert!(previous.is_some());
6970
if let Some(current) = ws.current_opt() {
70-
if member.package_id() != current.package_id() {
71+
if member.package_id() != current.package_id() &&
72+
!specs.iter().any(|spec| spec.matches(member.package_id())) {
7173
continue;
7274
}
7375
}

‎tests/workspaces.rs

+48
Original file line numberDiff line numberDiff line change
@@ -962,3 +962,51 @@ fn you_cannot_generate_lockfile_for_empty_workspaces() {
962962
error: you can't generate a lockfile for an empty workspace.
963963
"));
964964
}
965+
966+
#[test]
967+
fn workspace_with_transitive_dev_deps() {
968+
let p = project("foo")
969+
.file("Cargo.toml", r#"
970+
[project]
971+
name = "foo"
972+
version = "0.5.0"
973+
authors = ["[email protected]"]
974+
975+
[dependencies.bar]
976+
path = "bar"
977+
978+
[workspace]
979+
"#)
980+
.file("src/main.rs", r#"fn main() {}"#)
981+
.file("bar/Cargo.toml", r#"
982+
[project]
983+
name = "bar"
984+
version = "0.5.0"
985+
authors = ["[email protected]"]
986+
987+
[dev-dependencies.baz]
988+
path = "../baz"
989+
"#)
990+
.file("bar/src/lib.rs", r#"
991+
pub fn init() {}
992+
993+
#[cfg(test)]
994+
995+
#[test]
996+
fn test() {
997+
extern crate baz;
998+
baz::do_stuff();
999+
}
1000+
"#)
1001+
.file("baz/Cargo.toml", r#"
1002+
[project]
1003+
name = "baz"
1004+
version = "0.5.0"
1005+
authors = ["[email protected]"]
1006+
"#)
1007+
.file("baz/src/lib.rs", r#"pub fn do_stuff() {}"#);
1008+
p.build();
1009+
1010+
assert_that(p.cargo("test").args(&["-p", "bar"]),
1011+
execs().with_status(0));
1012+
}

0 commit comments

Comments
 (0)