Skip to content

Commit

Permalink
Fix cargo install using a workspace target dir
Browse files Browse the repository at this point in the history
Closes #5662
  • Loading branch information
alexcrichton committed Jul 5, 2018
1 parent f6719ff commit 1484c3f
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/cargo/ops/cargo_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,14 @@ fn install_one(
Some(Filesystem::new(config.cwd().join("target-install")))
};

let ws = Workspace::ephemeral(pkg, config, overidden_target_dir, false)?;
let ws = match overidden_target_dir {
Some(dir) => Workspace::ephemeral(pkg, config, Some(dir), false)?,
None => {
let mut ws = Workspace::new(pkg.manifest_path(), config)?;
ws.set_require_optional_deps(false);
ws
}
};
let pkg = ws.current()?;

if from_cwd {
Expand Down
44 changes: 44 additions & 0 deletions tests/testsuite/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1581,3 +1581,47 @@ fn git_repo_replace() {
.contains(&format!("{}", new_rev))
);
}

#[test]
fn workspace_uses_workspace_target_dir() {
let p = project("foo")
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
authors = []
[workspace]
[dependencies]
bar = { path = 'bar' }
"#,
)
.file("src/main.rs", "fn main() {}")
.file(
"bar/Cargo.toml",
r#"
[package]
name = "bar"
version = "0.1.0"
authors = []
"#,
)
.file("bar/src/main.rs", "fn main() {}")
.build();

assert_that(p.cargo("build").cwd(p.root().join("bar")).arg("--release"),
execs().with_status(0));
assert_that(
cargo_process("install").arg("--path").arg(p.root().join("bar")),
execs().with_status(0).with_stderr(
"[INSTALLING] [..]
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] [..]
warning: be sure to add `[..]` to your PATH to be able to run the installed binaries
",
),
);
}

0 comments on commit 1484c3f

Please sign in to comment.