development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-05 23:39:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Print file paths instead of file:// URLs.

Browse source 
This change ensures cargo will output file paths in the expected format
(C:\foo\... on Windows, /foo/... elsewhere). Previously it would output
file:// URLs instead.

To support this change, additional changes were made to the test suite
string processing such that [ROOT] is now replaced with the appropriate
file path root for the platform.

The CWD template was also updated to use [CWD] like other replacement
templates and to do the replacement on the expected value rather than
the actual value to avoid replacing things we don't expect with CWD.
This commit is contained in:
Zach Lute 2018-09-07 19:42:26 -07:00
parent 065e3ef98d
commit 89f43938fe
38 changed files with 600 additions and 573 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cargo/core/source/source_id.rs
View file

@ -210,7 +210,7 @@ impl SourceId {
}
pub fn display_registry(&self) -> String {
format!("registry `{}`", self.url())
format!("registry `{}`", url_display(self.url()))
}
/// Is this source from a filesystem path
@ -363,6 +363,18 @@ impl<'de> de::Deserialize<'de> for SourceId {
}
}
fn url_display(url: &Url) -> String {
if url.scheme() == "file" {
if let Ok(path) = url.to_file_path() {
if let Some(path_str) = path.to_str() {
return path_str.to_string();
}
}
}
url.as_str().to_string()
}
impl fmt::Display for SourceId {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
match *self.inner {
@ -370,13 +382,15 @@ impl fmt::Display for SourceId {
kind: Kind::Path,
ref url,
..
} => fmt::Display::fmt(url, f),
} => write!(f, "{}", url_display(url)),
SourceIdInner {
kind: Kind::Git(ref reference),
ref url,
ref precise,
..
} => {
// Don't replace the URL display for git references,
// because those are kind of expected to be URLs.
write!(f, "{}", url)?;
if let Some(pretty) = reference.pretty_ref() {
write!(f, "?{}", pretty)?;
@ -397,12 +411,12 @@ impl fmt::Display for SourceId {
kind: Kind::LocalRegistry,
ref url,
..
} => write!(f, "registry `{}`", url),
} => write!(f, "registry `{}`", url_display(url)),
SourceIdInner {
kind: Kind::Directory,
ref url,
..
} => write!(f, "dir {}", url),
} => write!(f, "dir {}", url_display(url)),
}
}
}

6
src/doc/src/reference/specifying-dependencies.md
View file

@ -250,13 +250,13 @@ In any case, typically all you need to do now is:
```console
$ cargo build
Compiling uuid v1.0.0 (file://.../uuid)
Compiling my-library v0.1.0 (file://.../my-library)
Compiling uuid v1.0.0 (.../uuid)
Compiling my-library v0.1.0 (.../my-library)
Finished dev [unoptimized + debuginfo] target(s) in 0.32 secs
```
And that's it! You're now building with the local version of `uuid` (note the
`file://` in the build output). If you don't see the `file://` version getting
path in parentheses in the build output). If you don't see the local path version getting
built then you may need to run `cargo update -p uuid --precise $version` where
`$version` is the version of the locally checked out copy of `uuid`.

69
tests/testsuite/alt_registry.rs
View file

@ -57,12 +57,12 @@ fn depend_on_alt_registry() {
.with_stderr(&format!(
"\
[UPDATING] registry `{reg}`
[DOWNLOADING] bar v0.0.1 (registry `file://[..]`)
[COMPILING] bar v0.0.1 (registry `file://[..]`)
[COMPILING] foo v0.0.1 (CWD)
[DOWNLOADING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
reg = registry::alt_registry()
reg = registry::alt_registry_path().to_str().unwrap()
)).run();
p.cargo("clean").masquerade_as_nightly_cargo().run();
@ -72,8 +72,8 @@ fn depend_on_alt_registry() {
.masquerade_as_nightly_cargo()
.with_stderr(
"\
[COMPILING] bar v0.0.1 (registry `file://[..]`)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -110,14 +110,14 @@ fn depend_on_alt_registry_depends_on_same_registry_no_index() {
.with_stderr(&format!(
"\
[UPDATING] registry `{reg}`
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[COMPILING] baz v0.0.1 (registry `file://[..]`)
[COMPILING] bar v0.0.1 (registry `file://[..]`)
[COMPILING] foo v0.0.1 (CWD)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[COMPILING] baz v0.0.1 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
reg = registry::alt_registry()
reg = registry::alt_registry_path().to_str().unwrap()
)).run();
}
@ -152,14 +152,14 @@ fn depend_on_alt_registry_depends_on_same_registry() {
.with_stderr(&format!(
"\
[UPDATING] registry `{reg}`
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[COMPILING] baz v0.0.1 (registry `file://[..]`)
[COMPILING] bar v0.0.1 (registry `file://[..]`)
[COMPILING] foo v0.0.1 (CWD)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[COMPILING] baz v0.0.1 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
reg = registry::alt_registry()
reg = registry::alt_registry_path().to_str().unwrap()
)).run();
}
@ -195,15 +195,15 @@ fn depend_on_alt_registry_depends_on_crates_io() {
"\
[UPDATING] registry `{alt_reg}`
[UPDATING] registry `{reg}`
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[COMPILING] baz v0.0.1 (registry `file://[..]`)
[COMPILING] bar v0.0.1 (registry `file://[..]`)
[COMPILING] foo v0.0.1 (CWD)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[COMPILING] baz v0.0.1 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
alt_reg = registry::alt_registry(),
reg = registry::registry()
alt_reg = registry::alt_registry_path().to_str().unwrap(),
reg = registry::registry_path().to_str().unwrap()
)).run();
}
@ -235,8 +235,8 @@ fn registry_and_path_dep_works() {
.masquerade_as_nightly_cargo()
.with_stderr(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -359,13 +359,16 @@ fn alt_registry_and_crates_io_deps() {
.masquerade_as_nightly_cargo()
.with_stderr_contains(format!(
"[UPDATING] registry `{}`",
registry::alt_registry()
)).with_stderr_contains(&format!("[UPDATING] registry `{}`", registry::registry()))
.with_stderr_contains("[DOWNLOADING] crates_io_dep v0.0.1 (registry `file://[..]`)")
.with_stderr_contains("[DOWNLOADING] alt_reg_dep v0.1.0 (registry `file://[..]`)")
.with_stderr_contains("[COMPILING] alt_reg_dep v0.1.0 (registry `file://[..]`)")
registry::alt_registry_path().to_str().unwrap()
))
.with_stderr_contains(&format!(
"[UPDATING] registry `{}`",
registry::registry_path().to_str().unwrap()))
.with_stderr_contains("[DOWNLOADING] crates_io_dep v0.0.1 (registry `[ROOT][..]`)")
.with_stderr_contains("[DOWNLOADING] alt_reg_dep v0.1.0 (registry `[ROOT][..]`)")
.with_stderr_contains("[COMPILING] alt_reg_dep v0.1.0 (registry `[ROOT][..]`)")
.with_stderr_contains("[COMPILING] crates_io_dep v0.0.1")
.with_stderr_contains("[COMPILING] foo v0.0.1 (CWD)")
.with_stderr_contains("[COMPILING] foo v0.0.1 ([CWD])")
.with_stderr_contains("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s")
.run();
}

2
tests/testsuite/bad_config.rs
View file

@ -641,7 +641,7 @@ fn unused_keys() {
.with_stderr(
"\
warning: unused manifest key: target.foo.bar
[COMPILING] foo v0.1.0 (CWD)
[COMPILING] foo v0.1.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();

46
tests/testsuite/bench.rs
View file

@ -39,7 +39,7 @@ fn cargo_bench_simple() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_stdout_contains("test bench_hello ... bench: [..]")
@ -78,7 +78,7 @@ fn bench_bench_implicit() {
p.cargo("bench --benches")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/mybench-[..][EXE]
@ -119,7 +119,7 @@ fn bench_bin_implicit() {
p.cargo("bench --bins")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]
",
@ -151,7 +151,7 @@ fn bench_tarname() {
p.cargo("bench --bench bin2")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/bin2-[..][EXE]
",
@ -215,7 +215,7 @@ fn cargo_bench_verbose() {
p.cargo("bench -v hello")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc [..] src/main.rs [..]`
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `[..]target/release/deps/foo-[..][EXE] hello --bench`",
@ -305,7 +305,7 @@ fn cargo_bench_failing_test() {
.with_stdout_contains("test bench_hello ...[..]")
.with_stderr_contains(
"\
[COMPILING] foo v0.5.0 (CWD)[..]
[COMPILING] foo v0.5.0 ([CWD])[..]
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_either_contains(
@ -372,7 +372,7 @@ fn bench_with_lib_dep() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/baz-[..][EXE]",
@ -433,7 +433,7 @@ fn bench_with_deep_lib_dep() {
.with_stderr(
"\
[COMPILING] foo v0.0.1 ([..])
[COMPILING] bar v0.0.1 (CWD)
[COMPILING] bar v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/bar-[..][EXE]",
).with_stdout_contains("test bar_bench ... bench: [..]")
@ -486,7 +486,7 @@ fn external_bench_explicit() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/bench-[..][EXE]",
@ -530,7 +530,7 @@ fn external_bench_implicit() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/external-[..][EXE]",
@ -605,7 +605,7 @@ automatically infer them to be a target, such as in subfolders.
For more information on this warning you can consult
https://github.com/rust-lang/cargo/issues/5330
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]
",
@ -649,7 +649,7 @@ fn pass_through_command_line() {
p.cargo("bench bar")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_stdout_contains("test bar ... bench: [..]")
@ -736,7 +736,7 @@ fn lib_bin_same_name() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/foo-[..][EXE]",
@ -782,7 +782,7 @@ fn lib_with_standard_name() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] syntax v0.0.1 (CWD)
[COMPILING] syntax v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/syntax-[..][EXE]
[RUNNING] target/release/deps/bench-[..][EXE]",
@ -831,7 +831,7 @@ fn lib_with_standard_name2() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] syntax v0.0.1 (CWD)
[COMPILING] syntax v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/syntax-[..][EXE]",
).with_stdout_contains("test bench ... bench: [..]")
@ -901,9 +901,9 @@ fn bench_dylib() {
p.cargo("bench -v")
.with_stderr(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[RUNNING] [..] -C opt-level=3 [..]
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] [..] -C opt-level=3 [..]
[RUNNING] [..] -C opt-level=3 [..]
[RUNNING] [..] -C opt-level=3 [..]
@ -917,8 +917,8 @@ fn bench_dylib() {
p.cargo("bench -v")
.with_stderr(
"\
[FRESH] bar v0.0.1 (CWD/bar)
[FRESH] foo v0.0.1 (CWD)
[FRESH] bar v0.0.1 ([CWD]/bar)
[FRESH] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench`
[RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`",
@ -957,7 +957,7 @@ fn bench_twice_with_build_cmd() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_stdout_contains("test foo ... bench: [..]")
@ -1041,13 +1041,13 @@ fn bench_with_examples() {
p.cargo("bench -v")
.with_stderr(
"\
[COMPILING] foo v6.6.6 (CWD)
[COMPILING] foo v6.6.6 ([CWD])
[RUNNING] `rustc [..]`
[RUNNING] `rustc [..]`
[RUNNING] `rustc [..]`
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `CWD/target/release/deps/foo-[..][EXE] --bench`
[RUNNING] `CWD/target/release/deps/testb1-[..][EXE] --bench`",
[RUNNING] `[CWD]/target/release/deps/foo-[..][EXE] --bench`
[RUNNING] `[CWD]/target/release/deps/testb1-[..][EXE] --bench`",
).with_stdout_contains("test bench_bench1 ... bench: [..]")
.with_stdout_contains("test bench_bench2 ... bench: [..]")
.run();

74
tests/testsuite/build.rs
View file

@ -806,8 +806,8 @@ fn cargo_compile_with_dep_name_mismatch() {
.with_status(101)
.with_stderr(
r#"error: no matching package named `notquitebar` found
location searched: CWD/bar
required by package `foo v0.0.1 (CWD)`
location searched: [CWD]/bar
required by package `foo v0.0.1 ([CWD])`
"#,
).run();
}
@ -1020,7 +1020,7 @@ fn main(){
.with_stderr(
"\
[COMPILING] present_dep v1.2.3
[COMPILING] foo v0.1.0 (CWD)
[COMPILING] foo v0.1.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
Running `[..]`",
).with_stdout("1.2.3")
@ -1164,7 +1164,7 @@ fn compile_offline_while_transitive_dep_not_cached() {
error: no matching package named `baz` found
location searched: registry `[..]`
required by package `bar v0.1.0`
... which is depended on by `foo v0.0.1 (CWD)`
... which is depended on by `foo v0.0.1 ([CWD])`
As a reminder, you're using offline mode (-Z offline) \
which can sometimes cause surprising resolution failures, \
if this error is too confusing you may with to retry \
@ -1260,21 +1260,21 @@ fn cargo_default_env_metadata_env_var() {
p.cargo("build -v")
.with_stderr(&format!(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --crate-type dylib \
--emit=dep-info,link \
-C prefer-dynamic -C debuginfo=2 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
[COMPILING] foo v0.0.1 (CWD)
-L dependency=[CWD]/target/debug/deps`
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
--emit=dep-info,link -C debuginfo=2 \
-C metadata=[..] \
-C extra-filename=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps \
--extern bar=CWD/target/debug/deps/{prefix}bar{suffix}`
-L dependency=[CWD]/target/debug/deps \
--extern bar=[CWD]/target/debug/deps/{prefix}bar{suffix}`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]",
prefix = env::consts::DLL_PREFIX,
suffix = env::consts::DLL_SUFFIX,
@ -1287,21 +1287,21 @@ fn cargo_default_env_metadata_env_var() {
.env("__CARGO_DEFAULT_LIB_METADATA", "stable")
.with_stderr(&format!(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --crate-type dylib \
--emit=dep-info,link \
-C prefer-dynamic -C debuginfo=2 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
[COMPILING] foo v0.0.1 (CWD)
-L dependency=[CWD]/target/debug/deps`
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
--emit=dep-info,link -C debuginfo=2 \
-C metadata=[..] \
-C extra-filename=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps \
--extern bar=CWD/target/debug/deps/{prefix}bar-[..]{suffix}`
-L dependency=[CWD]/target/debug/deps \
--extern bar=[CWD]/target/debug/deps/{prefix}bar-[..]{suffix}`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
prefix = env::consts::DLL_PREFIX,
@ -1370,7 +1370,7 @@ fn crate_env_vars() {
p.cargo("build -v").run();
println!("bin");
p.process(&p.bin("foo")).with_stdout("0-5-1 @ alpha.1 in CWD").run();
p.process(&p.bin("foo")).with_stdout("0-5-1 @ alpha.1 in [CWD]").run();
println!("test");
p.cargo("test -v").run();
@ -1551,8 +1551,8 @@ fn self_dependency() {
.with_status(101)
.with_stderr(
"\
[ERROR] cyclic package dependency: package `test v0.0.0 (CWD)` depends on itself. Cycle:
package `test v0.0.0 (CWD)`",
[ERROR] cyclic package dependency: package `test v0.0.0 ([CWD])` depends on itself. Cycle:
package `test v0.0.0 ([CWD])`",
).run();
}
@ -1615,14 +1615,14 @@ fn lto_build() {
p.cargo("build -v --release")
.with_stderr(
"\
[COMPILING] test v0.0.0 (CWD)
[COMPILING] test v0.0.0 ([CWD])
[RUNNING] `rustc --crate-name test src/main.rs --crate-type bin \
--emit=dep-info,link \
-C opt-level=3 \
-C lto \
-C metadata=[..] \
--out-dir CWD/target/release/deps \
-L dependency=CWD/target/release/deps`
--out-dir [CWD]/target/release/deps \
-L dependency=[CWD]/target/release/deps`
[FINISHED] release [optimized] target(s) in [..]
",
).run();
@ -1634,12 +1634,12 @@ fn verbose_build() {
p.cargo("build -v")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
--emit=dep-info,link -C debuginfo=2 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -1651,13 +1651,13 @@ fn verbose_release_build() {
p.cargo("build -v --release")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
--emit=dep-info,link \
-C opt-level=3 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/release/deps`
-L dependency=[CWD]/target/release/deps`
[FINISHED] release [optimized] target(s) in [..]
",
).run();
@ -1697,7 +1697,7 @@ fn verbose_release_build_deps() {
p.cargo("build -v --release")
.with_stderr(&format!(
"\
[COMPILING] foo v0.0.0 (CWD/foo)
[COMPILING] foo v0.0.0 ([CWD]/foo)
[RUNNING] `rustc --crate-name foo foo/src/lib.rs \
--crate-type dylib --crate-type rlib \
--emit=dep-info,link \
@ -1705,16 +1705,16 @@ fn verbose_release_build_deps() {
-C opt-level=3 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/release/deps`
[COMPILING] test v0.0.0 (CWD)
-L dependency=[CWD]/target/release/deps`
[COMPILING] test v0.0.0 ([CWD])
[RUNNING] `rustc --crate-name test src/lib.rs --crate-type lib \
--emit=dep-info,link \
-C opt-level=3 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/release/deps \
--extern foo=CWD/target/release/deps/{prefix}foo{suffix} \
--extern foo=CWD/target/release/deps/libfoo.rlib`
-L dependency=[CWD]/target/release/deps \
--extern foo=[CWD]/target/release/deps/{prefix}foo{suffix} \
--extern foo=[CWD]/target/release/deps/libfoo.rlib`
[FINISHED] release [optimized] target(s) in [..]
",
prefix = env::consts::DLL_PREFIX,
@ -2032,7 +2032,7 @@ fn lib_with_standard_name() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] syntax v0.0.1 (CWD)
[COMPILING] syntax v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -2142,7 +2142,7 @@ fn freshness_ignores_excluded() {
foo.cargo("build")
.with_stderr(
"\
[COMPILING] foo v0.0.0 (CWD)
[COMPILING] foo v0.0.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -2193,7 +2193,7 @@ fn rebuild_preserves_out_dir() {
.env("FIRST", "1")
.with_stderr(
"\
[COMPILING] foo v0.0.0 (CWD)
[COMPILING] foo v0.0.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -2202,7 +2202,7 @@ fn rebuild_preserves_out_dir() {
foo.cargo("build")
.with_stderr(
"\
[COMPILING] foo v0.0.0 (CWD)
[COMPILING] foo v0.0.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -2601,9 +2601,9 @@ fn cyclic_deps_rejected() {
p.cargo("build -v")
.with_status(101)
.with_stderr(
"[ERROR] cyclic package dependency: package `a v0.0.1 (CWD/a)` depends on itself. Cycle:
package `a v0.0.1 (CWD/a)`
... which is depended on by `foo v0.0.1 (CWD)`",
"[ERROR] cyclic package dependency: package `a v0.0.1 ([CWD]/a)` depends on itself. Cycle:
package `a v0.0.1 ([CWD]/a)`
... which is depended on by `foo v0.0.1 ([CWD])`",
).run();
}

4
tests/testsuite/build_lib.rs
View file

@ -10,12 +10,12 @@ fn build_lib_only() {
p.cargo("build --lib -v")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
--emit=dep-info,link -C debuginfo=2 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]",
).run();
}

52
tests/testsuite/build_script.rs
View file

@ -31,10 +31,10 @@ fn custom_build_script_failed() {
.with_status(101)
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc --crate-name build_script_build build.rs --crate-type bin [..]`
[RUNNING] `[..]/build-script-build`
[ERROR] failed to run custom build command for `foo v0.5.0 (CWD)`
[ERROR] failed to run custom build command for `foo v0.5.0 ([CWD])`
process didn't exit successfully: `[..]/build-script-build` (exit code: 101)",
).run();
}
@ -181,7 +181,7 @@ fn custom_build_script_wrong_rustc_flags() {
.with_status(101)
.with_stderr_contains(
"\
[ERROR] Only `-l` and `-L` flags are allowed in build script of `foo v0.5.0 (CWD)`: \
[ERROR] Only `-l` and `-L` flags are allowed in build script of `foo v0.5.0 ([CWD])`: \
`-aaa -bbb`",
).run();
}
@ -228,14 +228,14 @@ fn custom_build_script_rustc_flags() {
.with_status(101)
.with_stderr(
"\
[COMPILING] bar v0.5.0 (CWD)
[RUNNING] `rustc --crate-name test CWD/src/lib.rs --crate-type lib -C debuginfo=2 \
[COMPILING] bar v0.5.0 ([CWD])
[RUNNING] `rustc --crate-name test [CWD]/src/lib.rs --crate-type lib -C debuginfo=2 \
-C metadata=[..] \
-C extra-filename=-[..] \
--out-dir CWD/target \
--out-dir [CWD]/target \
--emit=dep-info,link \
-L CWD/target \
-L CWD/target/deps`
-L [CWD]/target \
-L [CWD]/target/deps`
",
).run();
}
@ -260,7 +260,7 @@ fn links_no_build_cmd() {
.with_status(101)
.with_stderr(
"\
[ERROR] package `foo v0.5.0 (CWD)` specifies that it links to `a` but does \
[ERROR] package `foo v0.5.0 ([CWD])` specifies that it links to `a` but does \
not have a custom build script
",
).run();
@ -551,7 +551,7 @@ fn only_rerun_build_script() {
p.cargo("build -v")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `[..]/build-script-build`
[RUNNING] `rustc --crate-name foo [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
@ -651,7 +651,7 @@ fn testing_and_such() {
p.cargo("test -vj1")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `[..]/build-script-build`
[RUNNING] `rustc --crate-name foo [..]`
[RUNNING] `rustc --crate-name foo [..]`
@ -666,7 +666,7 @@ fn testing_and_such() {
p.cargo("doc -v")
.with_stderr(
"\
[DOCUMENTING] foo v0.5.0 (CWD)
[DOCUMENTING] foo v0.5.0 ([CWD])
[RUNNING] `rustdoc [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -680,7 +680,7 @@ fn testing_and_such() {
p.cargo("run")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/foo[EXE]`
",
@ -746,7 +746,7 @@ fn propagation_of_l_flags() {
.with_stderr_contains(
"\
[RUNNING] `rustc --crate-name a [..] -L bar[..]-L foo[..]`
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc --crate-name foo [..] -L bar -L foo`
",
).run();
@ -815,7 +815,7 @@ fn propagation_of_l_flags_new() {
.with_stderr_contains(
"\
[RUNNING] `rustc --crate-name a [..] -L bar[..]-L foo[..]`
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc --crate-name foo [..] -L bar -L foo`
",
).run();
@ -850,9 +850,9 @@ fn build_deps_simple() {
p.cargo("build -v")
.with_stderr(
"\
[COMPILING] a v0.5.0 (CWD/a)
[COMPILING] a v0.5.0 ([CWD]/a)
[RUNNING] `rustc --crate-name a [..]`
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc [..] build.rs [..] --extern a=[..]`
[RUNNING] `[..]/foo-[..]/build-script-build`
[RUNNING] `rustc --crate-name foo [..]`
@ -950,9 +950,9 @@ fn build_cmd_with_a_build_cmd() {
p.cargo("build -v")
.with_stderr(
"\
[COMPILING] b v0.5.0 (CWD/b)
[COMPILING] b v0.5.0 ([CWD]/b)
[RUNNING] `rustc --crate-name b [..]`
[COMPILING] a v0.5.0 (CWD/a)
[COMPILING] a v0.5.0 ([CWD]/a)
[RUNNING] `rustc [..] a/build.rs [..] --extern b=[..]`
[RUNNING] `[..]/a-[..]/build-script-build`
[RUNNING] `rustc --crate-name a [..]lib.rs --crate-type lib \
@ -960,7 +960,7 @@ fn build_cmd_with_a_build_cmd() {
-C metadata=[..] \
--out-dir [..]target/debug/deps \
-L [..]target/debug/deps`
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc --crate-name build_script_build build.rs --crate-type bin \
--emit=dep-info,link \
-C debuginfo=2 -C metadata=[..] --out-dir [..] \
@ -1057,7 +1057,7 @@ fn output_separate_lines() {
.with_status(101)
.with_stderr_contains(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc [..] build.rs [..]`
[RUNNING] `[..]/foo-[..]/build-script-build`
[RUNNING] `rustc --crate-name foo [..] -L foo -l static=foo`
@ -1092,7 +1092,7 @@ fn output_separate_lines_new() {
.with_status(101)
.with_stderr_contains(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc [..] build.rs [..]`
[RUNNING] `[..]/foo-[..]/build-script-build`
[RUNNING] `rustc --crate-name foo [..] -L foo -l static=foo`
@ -1146,7 +1146,7 @@ fn code_generation() {
p.cargo("run")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/foo`",
).with_stdout("Hello, World!")
@ -1671,7 +1671,7 @@ fn cfg_test() {
p.cargo("test -v")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] [..] build.rs [..]
[RUNNING] `[..]/build-script-build`
[RUNNING] [..] --cfg foo[..]
@ -1776,7 +1776,7 @@ fn cfg_override_test() {
p.cargo("test -v")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `[..]`
[RUNNING] `[..]`
[RUNNING] `[..]`
@ -1899,7 +1899,7 @@ fn env_test() {
p.cargo("test -v")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] [..] build.rs [..]
[RUNNING] `[..]/build-script-build`
[RUNNING] [..] --crate-name foo[..]

2
tests/testsuite/cargo_command.rs
View file

@ -268,7 +268,7 @@ fn cargo_subcommand_args() {
if cfg!(windows) { // weird edge-case w/ CWD & (windows vs unix)
format!(r#"[{:?}, "foo", "bar", "-v", "--help"]"#, cargo_foo_bin)
} else {
r#"["CWD/cargo-foo/target/debug/cargo-foo", "foo", "bar", "-v", "--help"]"#.to_string()
r#"["[CWD]/cargo-foo/target/debug/cargo-foo", "foo", "bar", "-v", "--help"]"#.to_string()
}
).run();
}

40
tests/testsuite/cross_compile.rs
View file

@ -357,15 +357,15 @@ fn linker_and_ar() {
.with_status(101)
.with_stderr_contains(&format!(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc --crate-name foo src/foo.rs --crate-type bin \
--emit=dep-info,link -C debuginfo=2 \
-C metadata=[..] \
--out-dir CWD/target/{target}/debug/deps \
--out-dir [CWD]/target/{target}/debug/deps \
--target {target} \
-C ar=my-ar-tool -C linker=my-linker-tool \
-L dependency=CWD/target/{target}/debug/deps \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/{target}/debug/deps \
-L dependency=[CWD]/target/debug/deps`
",
target = target,
)).run();
@ -504,7 +504,7 @@ fn cross_tests() {
.arg(&target)
.with_stderr(&format!(
"\
[COMPILING] foo v0.0.0 (CWD)
[COMPILING] foo v0.0.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/{triple}/debug/deps/foo-[..][EXE]
[RUNNING] target/{triple}/debug/deps/bar-[..][EXE]",
@ -533,7 +533,7 @@ fn no_cross_doctests() {
let host_output =
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[DOCTEST] foo
@ -548,7 +548,7 @@ fn no_cross_doctests() {
.arg(&target)
.with_stderr(&format!(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/{triple}/debug/deps/foo-[..][EXE]
[DOCTEST] foo
@ -562,7 +562,7 @@ fn no_cross_doctests() {
.arg(&target)
.with_stderr(&format!(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/{triple}/debug/deps/foo-[..][EXE]
",
@ -643,9 +643,9 @@ fn cross_with_a_build_script() {
.arg(&target)
.with_stderr(&format!(
"\
[COMPILING] foo v0.0.0 (CWD)
[RUNNING] `rustc [..] build.rs [..] --out-dir CWD/target/debug/build/foo-[..]`
[RUNNING] `CWD/target/debug/build/foo-[..]/build-script-build`
[COMPILING] foo v0.0.0 ([CWD])
[RUNNING] `rustc [..] build.rs [..] --out-dir [CWD]/target/debug/build/foo-[..]`
[RUNNING] `[CWD]/target/debug/build/foo-[..]/build-script-build`
[RUNNING] `rustc [..] src/main.rs [..] --target {target} [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -731,19 +731,19 @@ fn build_script_needed_for_host_and_target() {
p.cargo("build -v --target")
.arg(&target)
.with_stderr_contains(&"[COMPILING] d1 v0.0.0 (CWD/d1)")
.with_stderr_contains(&"[COMPILING] d1 v0.0.0 ([CWD]/d1)")
.with_stderr_contains(
"[RUNNING] `rustc [..] d1/build.rs [..] --out-dir CWD/target/debug/build/d1-[..]`",
"[RUNNING] `rustc [..] d1/build.rs [..] --out-dir [CWD]/target/debug/build/d1-[..]`",
)
.with_stderr_contains("[RUNNING] `CWD/target/debug/build/d1-[..]/build-script-build`")
.with_stderr_contains("[RUNNING] `[CWD]/target/debug/build/d1-[..]/build-script-build`")
.with_stderr_contains("[RUNNING] `rustc [..] d1/src/lib.rs [..]`")
.with_stderr_contains("[COMPILING] d2 v0.0.0 (CWD/d2)")
.with_stderr_contains("[COMPILING] d2 v0.0.0 ([CWD]/d2)")
.with_stderr_contains(&format!(
"[RUNNING] `rustc [..] d2/src/lib.rs [..] -L /path/to/{host}`",
host = host
)).with_stderr_contains("[COMPILING] foo v0.0.0 (CWD)")
)).with_stderr_contains("[COMPILING] foo v0.0.0 ([CWD])")
.with_stderr_contains(&format!(
"[RUNNING] `rustc [..] build.rs [..] --out-dir CWD/target/debug/build/foo-[..] \
"[RUNNING] `rustc [..] build.rs [..] --out-dir [CWD]/target/debug/build/foo-[..] \
-L /path/to/{host}`",
host = host
)).with_stderr_contains(&format!(
@ -939,7 +939,7 @@ fn build_script_with_platform_specific_dependencies() {
[RUNNING] `rustc [..] d1/src/lib.rs [..]`
[COMPILING] foo v0.0.1 ([..])
[RUNNING] `rustc [..] build.rs [..]`
[RUNNING] `CWD/target/debug/build/foo-[..]/build-script-build`
[RUNNING] `[CWD]/target/debug/build/foo-[..]/build-script-build`
[RUNNING] `rustc [..] src/lib.rs [..] --target {target} [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -1152,8 +1152,8 @@ fn cross_test_dylib() {
.arg(&target)
.with_stderr(&format!(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/{arch}/debug/deps/foo-[..][EXE]
[RUNNING] target/{arch}/debug/deps/test-[..][EXE]",

14
tests/testsuite/cross_publish.rs
View file

@ -42,9 +42,9 @@ fn simple_cross_package() {
p.cargo("package --target")
.arg(&target)
.with_stderr(
" Packaging foo v0.0.0 (CWD)
Verifying foo v0.0.0 (CWD)
Compiling foo v0.0.0 (CWD/target/package/foo-0.0.0)
" Packaging foo v0.0.0 ([CWD])
Verifying foo v0.0.0 ([CWD])
Compiling foo v0.0.0 ([CWD]/target/package/foo-0.0.0)
Finished dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -105,11 +105,11 @@ fn publish_with_target() {
.arg(&target)
.with_stderr(&format!(
" Updating registry `{registry}`
Packaging foo v0.0.0 (CWD)
Verifying foo v0.0.0 (CWD)
Compiling foo v0.0.0 (CWD/target/package/foo-0.0.0)
Packaging foo v0.0.0 ([CWD])
Verifying foo v0.0.0 ([CWD])
Compiling foo v0.0.0 ([CWD]/target/package/foo-0.0.0)
Finished dev [unoptimized + debuginfo] target(s) in [..]
Uploading foo v0.0.0 (CWD)
Uploading foo v0.0.0 ([CWD])
",
registry = publish::registry()
)).run();

8
tests/testsuite/directory.rs
View file

@ -102,7 +102,7 @@ fn simple() {
.with_stderr(
"\
[COMPILING] bar v0.1.0
[COMPILING] foo v0.1.0 (CWD)
[COMPILING] foo v0.1.0 ([CWD])
[FINISHED] [..]
",
).run();
@ -298,7 +298,7 @@ fn multiple() {
.with_stderr(
"\
[COMPILING] bar v0.1.0
[COMPILING] foo v0.1.0 (CWD)
[COMPILING] foo v0.1.0 ([CWD])
[FINISHED] [..]
",
).run();
@ -333,7 +333,7 @@ fn crates_io_then_directory() {
[UPDATING] registry `[..]`
[DOWNLOADING] bar v0.1.0 ([..])
[COMPILING] bar v0.1.0
[COMPILING] foo v0.1.0 (CWD)
[COMPILING] foo v0.1.0 ([CWD])
[FINISHED] [..]
",
).run();
@ -350,7 +350,7 @@ fn crates_io_then_directory() {
.with_stderr(
"\
[COMPILING] bar v0.1.0
[COMPILING] foo v0.1.0 (CWD)
[COMPILING] foo v0.1.0 ([CWD])
[FINISHED] [..]
",
).run();

44
tests/testsuite/doc.rs
View file

@ -28,8 +28,8 @@ fn simple() {
p.cargo("doc")
.with_stderr(
"\
[..] foo v0.0.1 (CWD)
[..] foo v0.0.1 (CWD)
[..] foo v0.0.1 ([CWD])
[..] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -65,7 +65,7 @@ fn doc_twice() {
p.cargo("doc")
.with_stderr(
"\
[DOCUMENTING] foo v0.0.1 (CWD)
[DOCUMENTING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -95,9 +95,9 @@ fn doc_deps() {
p.cargo("doc")
.with_stderr(
"\
[..] bar v0.0.1 (CWD/bar)
[..] bar v0.0.1 (CWD/bar)
[DOCUMENTING] foo v0.0.1 (CWD)
[..] bar v0.0.1 ([CWD]/bar)
[..] bar v0.0.1 ([CWD]/bar)
[DOCUMENTING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -156,8 +156,8 @@ fn doc_no_deps() {
p.cargo("doc --no-deps")
.with_stderr(
"\
[CHECKING] bar v0.0.1 (CWD/bar)
[DOCUMENTING] foo v0.0.1 (CWD)
[CHECKING] bar v0.0.1 ([CWD]/bar)
[DOCUMENTING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -265,8 +265,8 @@ fn doc_multiple_targets_same_name() {
.build();
p.cargo("doc --all")
.with_stderr_contains("[DOCUMENTING] foo v0.1.0 (CWD/foo)")
.with_stderr_contains("[DOCUMENTING] bar v0.1.0 (CWD/bar)")
.with_stderr_contains("[DOCUMENTING] foo v0.1.0 ([CWD]/foo)")
.with_stderr_contains("[DOCUMENTING] bar v0.1.0 ([CWD]/bar)")
.with_stderr_contains("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]")
.run();
assert!(p.root().join("target/doc").is_dir());
@ -371,7 +371,7 @@ fn doc_lib_bin_same_name_documents_lib() {
p.cargo("doc")
.with_stderr(
"\
[DOCUMENTING] foo v0.0.1 (CWD)
[DOCUMENTING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -410,7 +410,7 @@ fn doc_lib_bin_same_name_documents_lib_when_requested() {
p.cargo("doc --lib")
.with_stderr(
"\
[DOCUMENTING] foo v0.0.1 (CWD)
[DOCUMENTING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -449,8 +449,8 @@ fn doc_lib_bin_same_name_documents_named_bin_when_requested() {
p.cargo("doc --bin foo")
.with_stderr(
"\
[CHECKING] foo v0.0.1 (CWD)
[DOCUMENTING] foo v0.0.1 (CWD)
[CHECKING] foo v0.0.1 ([CWD])
[DOCUMENTING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -489,8 +489,8 @@ fn doc_lib_bin_same_name_documents_bins_when_requested() {
p.cargo("doc --bins")
.with_stderr(
"\
[CHECKING] foo v0.0.1 (CWD)
[DOCUMENTING] foo v0.0.1 (CWD)
[CHECKING] foo v0.0.1 ([CWD])
[DOCUMENTING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -540,9 +540,9 @@ fn doc_dash_p() {
p.cargo("doc -p a")
.with_stderr(
"\
[..] b v0.0.1 (CWD/b)
[..] b v0.0.1 (CWD/b)
[DOCUMENTING] a v0.0.1 (CWD/a)
[..] b v0.0.1 ([CWD]/b)
[..] b v0.0.1 ([CWD]/b)
[DOCUMENTING] a v0.0.1 ([CWD]/a)
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -1028,7 +1028,7 @@ fn doc_workspace_open_different_library_and_package_names() {
p.cargo("doc --open")
.env("BROWSER", "echo")
.with_stderr_contains("[..] Documenting foo v0.1.0 ([..])")
.with_stderr_contains("[..] CWD/target/doc/foolib/index.html")
.with_stderr_contains("[..] [CWD]/target/doc/foolib/index.html")
.run();
}
@ -1058,7 +1058,7 @@ fn doc_workspace_open_binary() {
p.cargo("doc --open")
.env("BROWSER", "echo")
.with_stderr_contains("[..] Documenting foo v0.1.0 ([..])")
.with_stderr_contains("[..] Opening CWD/target/doc/foobin/index.html")
.with_stderr_contains("[..] Opening [CWD]/target/doc/foobin/index.html")
.run();
}
@ -1091,7 +1091,7 @@ fn doc_workspace_open_binary_and_library() {
p.cargo("doc --open")
.env("BROWSER", "echo")
.with_stderr_contains("[..] Documenting foo v0.1.0 ([..])")
.with_stderr_contains("[..] Opening CWD/target/doc/foolib/index.html")
.with_stderr_contains("[..] Opening [CWD]/target/doc/foolib/index.html")
.run();
}

50
tests/testsuite/features.rs
View file

@ -417,7 +417,7 @@ fn no_feature_doesnt_build() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -426,8 +426,8 @@ fn no_feature_doesnt_build() {
p.cargo("build --features bar")
.with_stderr(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -469,8 +469,8 @@ fn default_feature_pulled_in() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -479,7 +479,7 @@ fn default_feature_pulled_in() {
p.cargo("build --no-default-features")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -577,9 +577,9 @@ fn groups_on_groups_on_groups() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -623,9 +623,9 @@ fn many_cli_features() {
.arg("bar baz")
.with_stderr(
"\
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -700,9 +700,9 @@ fn union_features() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] d2 v0.0.1 (CWD/d2)
[COMPILING] d1 v0.0.1 (CWD/d1)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] d2 v0.0.1 ([CWD]/d2)
[COMPILING] d1 v0.0.1 ([CWD]/d1)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -743,8 +743,8 @@ fn many_features_no_rebuilds() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] a v0.1.0 (CWD/a)
[COMPILING] b v0.1.0 (CWD)
[COMPILING] a v0.1.0 ([CWD]/a)
[COMPILING] b v0.1.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -1199,9 +1199,9 @@ fn many_cli_features_comma_delimited() {
p.cargo("build --features bar,baz")
.with_stderr(
"\
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -1261,11 +1261,11 @@ fn many_cli_features_comma_and_space_delimited() {
.arg("bar,baz bam bap")
.with_stderr(
"\
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] ba[..] v0.0.1 (CWD/ba[..])
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] ba[..] v0.0.1 ([CWD]/ba[..])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();

18
tests/testsuite/freshness.rs
View file

@ -16,7 +16,7 @@ fn modifying_and_moving() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -32,7 +32,7 @@ fn modifying_and_moving() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -54,7 +54,7 @@ fn modify_only_some_files() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -80,7 +80,7 @@ fn modify_only_some_files() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -644,16 +644,16 @@ fn same_build_dir_cached_packages() {
[COMPILING] d v0.0.1 ({dir}/d)
[COMPILING] c v0.0.1 ({dir}/c)
[COMPILING] b v0.0.1 ({dir}/b)
[COMPILING] a1 v0.0.1 (CWD)
[COMPILING] a1 v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
dir = p.url()
dir = p.url().to_file_path().unwrap().to_str().unwrap()
)).run();
p.cargo("build")
.cwd(p.root().join("a2"))
.with_stderr(
"\
[COMPILING] a2 v0.0.1 (CWD)
[COMPILING] a2 v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -748,7 +748,7 @@ fn rebuild_if_environment_changes() {
.with_stdout("old desc")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/foo[EXE]`
",
@ -770,7 +770,7 @@ fn rebuild_if_environment_changes() {
.with_stdout("new desc")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/foo[EXE]`
",

34
tests/testsuite/git.rs
View file

@ -57,7 +57,7 @@ fn cargo_compile_simple_git_dep() {
.with_stderr(&format!(
"[UPDATING] git repository `{}`\n\
[COMPILING] dep1 v0.5.0 ({}#[..])\n\
[COMPILING] foo v0.5.0 (CWD)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n",
path2url(&git_root),
path2url(&git_root),
@ -193,7 +193,7 @@ fn cargo_compile_offline_with_cached_git_dep() {
.with_stderr(format!(
"\
[COMPILING] dep1 v0.5.0 ({}#[..])
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]",
path2url(git_root),
)).run();
@ -281,7 +281,7 @@ fn cargo_compile_git_dep_branch() {
.with_stderr(&format!(
"[UPDATING] git repository `{}`\n\
[COMPILING] dep1 v0.5.0 ({}?branch=branchy#[..])\n\
[COMPILING] foo v0.5.0 (CWD)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n",
path2url(&git_root),
path2url(&git_root),
@ -352,7 +352,7 @@ fn cargo_compile_git_dep_tag() {
.with_stderr(&format!(
"[UPDATING] git repository `{}`\n\
[COMPILING] dep1 v0.5.0 ({}?tag=v0.1.0#[..])\n\
[COMPILING] foo v0.5.0 (CWD)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n",
path2url(&git_root),
path2url(&git_root),
@ -722,7 +722,7 @@ fn recompilation() {
.with_stderr(&format!(
"[UPDATING] git repository `{}`\n\
[COMPILING] bar v0.5.0 ({}#[..])\n\
[COMPILING] foo v0.5.0 (CWD)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
git_project.url(),
@ -770,7 +770,7 @@ fn recompilation() {
p.cargo("build")
.with_stderr(&format!(
"[COMPILING] bar v0.5.0 ({}#[..])\n\
[COMPILING] foo v0.5.0 (CWD)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
git_project.url(),
@ -780,7 +780,7 @@ fn recompilation() {
p.cargo("clean -p foo").with_stdout("").run();
p.cargo("build")
.with_stderr(
"[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]"
).run();
@ -859,7 +859,7 @@ fn update_with_shared_deps() {
[COMPILING] bar v0.5.0 ({git}#[..])
[COMPILING] [..] v0.5.0 ([..])
[COMPILING] [..] v0.5.0 ([..])
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n",
git = git_project.url(),
)).run();
@ -918,9 +918,9 @@ Caused by:
.with_stderr(&format!(
"\
[COMPILING] bar v0.5.0 ({git}#[..])
[COMPILING] [..] v0.5.0 (CWD[..]dep[..])
[COMPILING] [..] v0.5.0 (CWD[..]dep[..])
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] [..] v0.5.0 ([CWD][..]dep[..])
[COMPILING] [..] v0.5.0 ([CWD][..]dep[..])
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n",
git = git_project.url(),
)).run();
@ -1096,7 +1096,7 @@ fn two_deps_only_update_one() {
[UPDATING] git repository `[..]`\n\
[COMPILING] [..] v0.5.0 ([..])\n\
[COMPILING] [..] v0.5.0 ([..])\n\
[COMPILING] foo v0.5.0 (CWD)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n",
).run();
@ -1196,7 +1196,7 @@ fn stale_cached_version() {
"\
[UPDATING] git repository `{bar}`
[COMPILING] bar v0.0.0 ({bar}#[..])
[COMPILING] foo v0.0.0 (CWD)
[COMPILING] foo v0.0.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
bar = bar.url(),
@ -1359,7 +1359,7 @@ fn dev_deps_with_testing() {
.with_stderr(&format!(
"\
[UPDATING] git repository `{bar}`
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
bar = p2.url()
@ -1402,7 +1402,7 @@ fn git_build_cmd_freshness() {
foo.cargo("build")
.with_stderr(
"\
[COMPILING] foo v0.0.0 (CWD)
[COMPILING] foo v0.0.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -1459,7 +1459,7 @@ fn git_name_not_always_needed() {
.with_stderr(&format!(
"\
[UPDATING] git repository `{bar}`
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
bar = p2.url()
@ -1681,7 +1681,7 @@ fn warnings_in_git_dep() {
.with_stderr(&format!(
"[UPDATING] git repository `{}`\n\
[COMPILING] bar v0.5.0 ({}#[..])\n\
[COMPILING] foo v0.5.0 (CWD)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n",
bar.url(),
bar.url(),

38
tests/testsuite/install.rs
View file

@ -31,14 +31,14 @@ fn simple() {
[INSTALLING] foo v0.0.1
[COMPILING] foo v0.0.1
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] CWD/home/.cargo/bin/foo[EXE]
[INSTALLING] [CWD]/home/.cargo/bin/foo[EXE]
warning: be sure to add `[..]` to your PATH to be able to run the installed binaries
",
).run();
assert_has_installed_exe(cargo_home(), "foo");
cargo_process("uninstall foo")
.with_stderr("[REMOVING] CWD/home/.cargo/bin/foo[EXE]")
.with_stderr("[REMOVING] [CWD]/home/.cargo/bin/foo[EXE]")
.run();
assert_has_not_installed_exe(cargo_home(), "foo");
}
@ -53,16 +53,16 @@ fn multiple_pkgs() {
.with_stderr(
"\
[UPDATING] registry `[..]`
[DOWNLOADING] foo v0.0.1 (registry `CWD/registry`)
[DOWNLOADING] foo v0.0.1 (registry `[CWD]/registry`)
[INSTALLING] foo v0.0.1
[COMPILING] foo v0.0.1
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] CWD/home/.cargo/bin/foo[EXE]
[DOWNLOADING] bar v0.0.2 (registry `CWD/registry`)
[INSTALLING] [CWD]/home/.cargo/bin/foo[EXE]
[DOWNLOADING] bar v0.0.2 (registry `[CWD]/registry`)
[INSTALLING] bar v0.0.2
[COMPILING] bar v0.0.2
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] CWD/home/.cargo/bin/bar[EXE]
[INSTALLING] [CWD]/home/.cargo/bin/bar[EXE]
error: could not find `baz` in registry `[..]`
[SUMMARY] Successfully installed foo, bar! Failed to install baz (see error(s) above).
warning: be sure to add `[..]` to your PATH to be able to run the installed binaries
@ -75,8 +75,8 @@ error: some crates failed to install
cargo_process("uninstall foo bar")
.with_stderr(
"\
[REMOVING] CWD/home/.cargo/bin/foo[EXE]
[REMOVING] CWD/home/.cargo/bin/bar[EXE]
[REMOVING] [CWD]/home/.cargo/bin/foo[EXE]
[REMOVING] [CWD]/home/.cargo/bin/bar[EXE]
[SUMMARY] Successfully uninstalled foo, bar!
",
).run();
@ -101,7 +101,7 @@ fn pick_max_version() {
[INSTALLING] foo v0.2.1
[COMPILING] foo v0.2.1
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] CWD/home/.cargo/bin/foo[EXE]
[INSTALLING] [CWD]/home/.cargo/bin/foo[EXE]
warning: be sure to add `[..]` to your PATH to be able to run the installed binaries
",
).run();
@ -435,7 +435,7 @@ fn install_force() {
[INSTALLING] foo v0.2.0 ([..])
[COMPILING] foo v0.2.0 ([..])
[FINISHED] release [optimized] target(s) in [..]
[REPLACING] CWD/home/.cargo/bin/foo[EXE]
[REPLACING] [CWD]/home/.cargo/bin/foo[EXE]
warning: be sure to add `[..]` to your PATH to be able to run the installed binaries
",
).run();
@ -472,8 +472,8 @@ fn install_force_partial_overlap() {
[INSTALLING] foo v0.2.0 ([..])
[COMPILING] foo v0.2.0 ([..])
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] CWD/home/.cargo/bin/foo-bin3[EXE]
[REPLACING] CWD/home/.cargo/bin/foo-bin2[EXE]
[INSTALLING] [CWD]/home/.cargo/bin/foo-bin3[EXE]
[REPLACING] [CWD]/home/.cargo/bin/foo-bin2[EXE]
warning: be sure to add `[..]` to your PATH to be able to run the installed binaries
",
).run();
@ -513,7 +513,7 @@ fn install_force_bin() {
[INSTALLING] foo v0.2.0 ([..])
[COMPILING] foo v0.2.0 ([..])
[FINISHED] release [optimized] target(s) in [..]
[REPLACING] CWD/home/.cargo/bin/foo-bin2[EXE]
[REPLACING] [CWD]/home/.cargo/bin/foo-bin2[EXE]
warning: be sure to add `[..]` to your PATH to be able to run the installed binaries
",
).run();
@ -565,7 +565,7 @@ fn git_repo() {
[INSTALLING] foo v0.1.0 ([..])
[COMPILING] foo v0.1.0 ([..])
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] CWD/home/.cargo/bin/foo[EXE]
[INSTALLING] [CWD]/home/.cargo/bin/foo[EXE]
warning: be sure to add `[..]` to your PATH to be able to run the installed binaries
",
).run();
@ -744,8 +744,8 @@ fn uninstall_cwd() {
p.cargo("install --path .")
.with_stderr(&format!(
"\
[INSTALLING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD)
[INSTALLING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] {home}/bin/foo[EXE]
warning: be sure to add `{home}/bin` to your PATH to be able to run the installed binaries",
@ -771,7 +771,7 @@ fn uninstall_cwd_not_installed() {
.with_stdout("")
.with_stderr(
"\
error: package `foo v0.0.1 (CWD)` is not installed",
error: package `foo v0.0.1 ([CWD])` is not installed",
).run();
}
@ -787,7 +787,7 @@ fn uninstall_cwd_no_project() {
.with_stdout("")
.with_stderr(format!(
"\
[ERROR] failed to read `CWD/Cargo.toml`
[ERROR] failed to read `[CWD]/Cargo.toml`
Caused by:
{err_msg} (os error 2)",
@ -1071,7 +1071,7 @@ fn uninstall_multiple_and_some_pkg_does_not_exist() {
.with_status(101)
.with_stderr(
"\
[REMOVING] CWD/home/.cargo/bin/foo[EXE]
[REMOVING] [CWD]/home/.cargo/bin/foo[EXE]
error: package id specification `bar` matched no packages
[SUMMARY] Successfully uninstalled foo! Failed to uninstall bar (see error(s) above).
error: some packages failed to uninstall

12
tests/testsuite/local_registry.rs
View file

@ -50,7 +50,7 @@ fn simple() {
"\
[UNPACKING] bar v0.0.1 ([..])
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] [..]
",
).run();
@ -89,7 +89,7 @@ fn multiple_versions() {
"\
[UNPACKING] bar v0.1.0 ([..])
[COMPILING] bar v0.1.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] [..]
",
).run();
@ -148,7 +148,7 @@ fn multiple_names() {
[UNPACKING] [..]
[COMPILING] [..]
[COMPILING] [..]
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] [..]
",
).run();
@ -199,7 +199,7 @@ fn interdependent() {
[UNPACKING] [..]
[COMPILING] bar v0.0.1
[COMPILING] baz v0.1.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] [..]
",
).run();
@ -263,7 +263,7 @@ fn path_dep_rewritten() {
[UNPACKING] [..]
[COMPILING] bar v0.0.1
[COMPILING] baz v0.1.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] [..]
",
).run();
@ -413,7 +413,7 @@ fn crates_io_registry_url_is_optional() {
"\
[UNPACKING] bar v0.0.1 ([..])
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] [..]
",
).run();

2
tests/testsuite/new.rs
View file

@ -105,7 +105,7 @@ fn existing() {
cargo_process("new foo")
.with_status(101)
.with_stderr(
"[ERROR] destination `CWD/foo` already exists\n\n\
"[ERROR] destination `[CWD]/foo` already exists\n\n\
Use `cargo init` to initialize the directory",
).run();
}

44
tests/testsuite/overrides.rs
View file

@ -38,10 +38,10 @@ fn override_simple() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[UPDATING] git repository `[..]`
[COMPILING] bar v0.1.0 (file://[..])
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.1.0 ([ROOT][..])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -183,12 +183,12 @@ fn transitive() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[UPDATING] git repository `[..]`
[DOWNLOADING] baz v0.2.0 (registry [..])
[COMPILING] bar v0.1.0 (file://[..])
[COMPILING] bar v0.1.0 ([ROOT][..])
[COMPILING] baz v0.2.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -231,10 +231,10 @@ fn persists_across_rebuilds() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] git repository `file://[..]`
[COMPILING] bar v0.1.0 (file://[..])
[COMPILING] foo v0.0.1 (CWD)
[UPDATING] registry `[ROOT][..]`
[UPDATING] git repository `[ROOT][..]`
[COMPILING] bar v0.1.0 ([ROOT][..])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -275,9 +275,9 @@ fn replace_registry_with_path() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[COMPILING] bar v0.1.0 (file://[..])
[COMPILING] foo v0.0.1 (CWD)
[UPDATING] registry `[ROOT][..]`
[COMPILING] bar v0.1.0 ([ROOT][..])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -336,14 +336,14 @@ fn use_a_spec_to_select() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[UPDATING] git repository `[..]`
[DOWNLOADING] [..]
[DOWNLOADING] [..]
[COMPILING] [..]
[COMPILING] [..]
[COMPILING] [..]
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -393,12 +393,12 @@ fn override_adds_some_deps() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[UPDATING] git repository `[..]`
[DOWNLOADING] baz v0.1.1 (registry [..])
[COMPILING] baz v0.1.1
[COMPILING] bar v0.1.0 ([..])
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -410,14 +410,14 @@ fn override_adds_some_deps() {
.arg(&format!("{}#bar", foo.url()))
.with_stderr(
"\
[UPDATING] git repository `file://[..]`
[UPDATING] registry `file://[..]`
[UPDATING] git repository `[ROOT][..]`
[UPDATING] registry `[ROOT][..]`
",
).run();
p.cargo("update -p https://github.com/rust-lang/crates.io-index#bar")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
",
).run();
@ -511,7 +511,7 @@ fn override_wrong_name() {
[UPDATING] registry [..]
[UPDATING] git repository [..]
error: no matching package for override `[..]baz:0.1.0` found
location searched: file://[..]
location searched: [ROOT][..]
version required: = 0.1.0
",
).run();
@ -555,7 +555,7 @@ fn override_with_nothing() {
[ERROR] failed to load source for a dependency on `bar`
Caused by:
Unable to update file://[..]
Unable to update [ROOT][..]
Caused by:
Could not find Cargo.toml in `[..]`

48
tests/testsuite/package.rs
View file

@ -31,9 +31,9 @@ fn simple() {
"\
[WARNING] manifest has no documentation[..]
See [..]
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD[..])
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -75,9 +75,9 @@ fn metadata_warning() {
warning: manifest has no description, license, license-file, documentation, \
homepage or repository.
See http://doc.crates.io/manifest.html#package-metadata for more info.
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD[..])
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -99,9 +99,9 @@ See http://doc.crates.io/manifest.html#package-metadata for more info.
"\
warning: manifest has no description, documentation, homepage or repository.
See http://doc.crates.io/manifest.html#package-metadata for more info.
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD[..])
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -123,9 +123,9 @@ See http://doc.crates.io/manifest.html#package-metadata for more info.
p.cargo("package")
.with_stderr(
"\
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD[..])
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -206,9 +206,9 @@ fn package_verification() {
"\
[WARNING] manifest has no description[..]
See http://doc.crates.io/manifest.html#package-metadata for more info.
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD[..])
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -545,9 +545,9 @@ fn ignore_nested() {
"\
[WARNING] manifest has no documentation[..]
See http://doc.crates.io/manifest.html#package-metadata for more info.
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD[..])
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -631,9 +631,9 @@ fn repackage_on_source_change() {
"\
[WARNING] [..]
See [..]
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD[..])
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -1104,9 +1104,9 @@ fn package_lockfile() {
"\
[WARNING] manifest has no documentation[..]
See [..]
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 (CWD[..])
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();

68
tests/testsuite/patch.rs
View file

@ -50,11 +50,11 @@ fn replace() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[DOWNLOADING] baz v0.1.0 ([..])
[COMPILING] bar v0.1.0 (CWD/bar)
[COMPILING] bar v0.1.0 ([CWD]/bar)
[COMPILING] baz v0.1.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -91,9 +91,9 @@ fn nonexistent() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[COMPILING] bar v0.1.0 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[UPDATING] registry `[ROOT][..]`
[COMPILING] bar v0.1.0 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -135,9 +135,9 @@ fn patch_git() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] git repository `file://[..]`
[COMPILING] bar v0.1.0 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[UPDATING] git repository `[ROOT][..]`
[COMPILING] bar v0.1.0 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -179,10 +179,10 @@ fn patch_to_git() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] git repository `file://[..]`
[UPDATING] registry `file://[..]`
[COMPILING] bar v0.1.0 (file://[..])
[COMPILING] foo v0.0.1 (CWD)
[UPDATING] git repository `[ROOT][..]`
[UPDATING] registry `[ROOT][..]`
[COMPILING] bar v0.1.0 ([ROOT][..])
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -216,10 +216,10 @@ fn unused() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[DOWNLOADING] bar v0.1.0 [..]
[COMPILING] bar v0.1.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -273,11 +273,11 @@ fn unused_git() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] git repository `file://[..]`
[UPDATING] registry `file://[..]`
[UPDATING] git repository `[ROOT][..]`
[UPDATING] registry `[ROOT][..]`
[DOWNLOADING] bar v0.1.0 [..]
[COMPILING] bar v0.1.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -308,10 +308,10 @@ fn add_patch() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[DOWNLOADING] bar v0.1.0 [..]
[COMPILING] bar v0.1.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -335,8 +335,8 @@ fn add_patch() {
p.cargo("build")
.with_stderr(
"\
[COMPILING] bar v0.1.0 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.1.0 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -367,10 +367,10 @@ fn add_ignored_patch() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[DOWNLOADING] bar v0.1.0 [..]
[COMPILING] bar v0.1.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -424,9 +424,9 @@ fn new_minor() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[COMPILING] bar v0.1.1 [..]
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -471,10 +471,10 @@ fn transitive_new_minor() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[COMPILING] baz v0.1.1 [..]
[COMPILING] bar v0.1.0 [..]
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -507,9 +507,9 @@ fn new_major() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[COMPILING] bar v0.2.0 [..]
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -534,10 +534,10 @@ fn new_major() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[DOWNLOADING] bar v0.2.0 [..]
[COMPILING] bar v0.2.0
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -582,10 +582,10 @@ fn transitive_new_major() {
p.cargo("build")
.with_stderr(
"\
[UPDATING] registry `file://[..]`
[UPDATING] registry `[ROOT][..]`
[COMPILING] baz v0.2.0 [..]
[COMPILING] bar v0.1.0 [..]
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();

64
tests/testsuite/path.rs
View file

@ -65,9 +65,9 @@ fn cargo_compile_with_nested_deps_shorthand() {
p.cargo("build")
.with_stderr(
"[COMPILING] baz v0.5.0 (CWD/bar/baz)\n\
[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] baz v0.5.0 ([CWD]/bar/baz)\n\
[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -81,15 +81,15 @@ fn cargo_compile_with_nested_deps_shorthand() {
println!("building baz");
p.cargo("build -p baz")
.with_stderr(
"[COMPILING] baz v0.5.0 (CWD/bar/baz)\n\
"[COMPILING] baz v0.5.0 ([CWD]/bar/baz)\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
println!("building foo");
p.cargo("build -p foo")
.with_stderr(
"[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -223,8 +223,8 @@ fn cargo_compile_with_transitive_dev_deps() {
p.cargo("build")
.with_stderr(
"[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) in \
[..]\n",
).run();
@ -256,8 +256,8 @@ fn no_rebuild_dependency() {
// First time around we should compile both foo and bar
p.cargo("build")
.with_stderr(
"[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -318,9 +318,9 @@ fn deep_dependencies_trigger_rebuild() {
.build();
p.cargo("build")
.with_stderr(
"[COMPILING] baz v0.5.0 (CWD/baz)\n\
[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] baz v0.5.0 ([CWD]/baz)\n\
[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -337,9 +337,9 @@ fn deep_dependencies_trigger_rebuild() {
sleep_ms(1000);
p.cargo("build")
.with_stderr(
"[COMPILING] baz v0.5.0 (CWD/baz)\n\
[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] baz v0.5.0 ([CWD]/baz)\n\
[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -356,8 +356,8 @@ fn deep_dependencies_trigger_rebuild() {
sleep_ms(1000);
p.cargo("build")
.with_stderr(
"[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -401,9 +401,9 @@ fn no_rebuild_two_deps() {
.build();
p.cargo("build")
.with_stderr(
"[COMPILING] baz v0.5.0 (CWD/baz)\n\
[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] baz v0.5.0 ([CWD]/baz)\n\
[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -436,8 +436,8 @@ fn nested_deps_recompile() {
p.cargo("build")
.with_stderr(
"[COMPILING] bar v0.5.0 (CWD/src/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] bar v0.5.0 ([CWD]/src/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -451,7 +451,7 @@ fn nested_deps_recompile() {
// This shouldn't recompile `bar`
p.cargo("build")
.with_stderr(
"[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -484,7 +484,7 @@ fn error_message_for_missing_manifest() {
[ERROR] failed to load source for a dependency on `bar`
Caused by:
Unable to update CWD/src/bar
Unable to update [CWD]/src/bar
Caused by:
failed to read `[..]bar/Cargo.toml`
@ -661,8 +661,8 @@ fn path_dep_build_cmd() {
p.cargo("build")
.with_stderr(
"[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) in \
[..]\n",
).run();
@ -681,8 +681,8 @@ fn path_dep_build_cmd() {
p.cargo("build")
.with_stderr(
"[COMPILING] bar v0.5.0 (CWD/bar)\n\
[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] bar v0.5.0 ([CWD]/bar)\n\
[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) in \
[..]\n",
).run();
@ -720,7 +720,7 @@ fn dev_deps_no_rebuild_lib() {
p.cargo("build")
.env("FOO", "bar")
.with_stderr(
"[COMPILING] foo v0.5.0 (CWD)\n\
"[COMPILING] foo v0.5.0 ([CWD])\n\
[FINISHED] dev [unoptimized + debuginfo] target(s) \
in [..]\n",
).run();
@ -728,8 +728,8 @@ fn dev_deps_no_rebuild_lib() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] [..] v0.5.0 (CWD[..])
[COMPILING] [..] v0.5.0 (CWD[..])
[COMPILING] [..] v0.5.0 ([CWD][..])
[COMPILING] [..] v0.5.0 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]",
).with_stdout_contains("running 0 tests")

4
tests/testsuite/profile_config.rs
View file

@ -94,7 +94,7 @@ fn profile_config_error_paths() {
.with_status(101)
.with_stderr(
"\
[ERROR] failed to parse manifest at `CWD/Cargo.toml`
[ERROR] failed to parse manifest at `[CWD]/Cargo.toml`
Caused by:
error in [..].cargo/config: `profile.dev.rpath` expected true/false, but found a string
@ -128,7 +128,7 @@ fn profile_config_validate_errors() {
.with_status(101)
.with_stderr(
"\
[ERROR] failed to parse manifest at `CWD/Cargo.toml`
[ERROR] failed to parse manifest at `[CWD]/Cargo.toml`
Caused by:
config profile `profile.dev` is not valid

30
tests/testsuite/profiles.rs
View file

@ -25,7 +25,7 @@ fn profile_overrides() {
p.cargo("build -v")
.with_stderr(
"\
[COMPILING] test v0.0.0 (CWD)
[COMPILING] test v0.0.0 ([CWD])
[RUNNING] `rustc --crate-name test src/lib.rs --crate-type lib \
--emit=dep-info,link \
-C opt-level=1 \
@ -33,7 +33,7 @@ fn profile_overrides() {
-C metadata=[..] \
-C rpath \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [optimized] target(s) in [..]
",
).run();
@ -59,13 +59,13 @@ fn opt_level_override_0() {
p.cargo("build -v")
.with_stderr(
"\
[COMPILING] test v0.0.0 (CWD)
[COMPILING] test v0.0.0 ([CWD])
[RUNNING] `rustc --crate-name test src/lib.rs --crate-type lib \
--emit=dep-info,link \
-C debuginfo=2 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] [..] target(s) in [..]
",
).run();
@ -90,13 +90,13 @@ fn debug_override_1() {
p.cargo("build -v")
.with_stderr(
"\
[COMPILING] test v0.0.0 (CWD)
[COMPILING] test v0.0.0 ([CWD])
[RUNNING] `rustc --crate-name test src/lib.rs --crate-type lib \
--emit=dep-info,link \
-C debuginfo=1 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] [..] target(s) in [..]
",
).run();
@ -124,7 +124,7 @@ fn check_opt_level_override(profile_level: &str, rustc_level: &str) {
p.cargo("build -v")
.with_stderr(&format!(
"\
[COMPILING] test v0.0.0 (CWD)
[COMPILING] test v0.0.0 ([CWD])
[RUNNING] `rustc --crate-name test src/lib.rs --crate-type lib \
--emit=dep-info,link \
-C opt-level={level} \
@ -132,7 +132,7 @@ fn check_opt_level_override(profile_level: &str, rustc_level: &str) {
-C debug-assertions=on \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] [..] target(s) in [..]
",
level = rustc_level
@ -198,7 +198,7 @@ fn top_level_overrides_deps() {
p.cargo("build -v --release")
.with_stderr(&format!(
"\
[COMPILING] foo v0.0.0 (CWD/foo)
[COMPILING] foo v0.0.0 ([CWD]/foo)
[RUNNING] `rustc --crate-name foo foo/src/lib.rs \
--crate-type dylib --crate-type rlib \
--emit=dep-info,link \
@ -206,19 +206,19 @@ fn top_level_overrides_deps() {
-C opt-level=1 \
-C debuginfo=2 \
-C metadata=[..] \
--out-dir CWD/target/release/deps \
-L dependency=CWD/target/release/deps`
[COMPILING] test v0.0.0 (CWD)
--out-dir [CWD]/target/release/deps \
-L dependency=[CWD]/target/release/deps`
[COMPILING] test v0.0.0 ([CWD])
[RUNNING] `rustc --crate-name test src/lib.rs --crate-type lib \
--emit=dep-info,link \
-C opt-level=1 \
-C debuginfo=2 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/release/deps \
--extern foo=CWD/target/release/deps/\
-L dependency=[CWD]/target/release/deps \
--extern foo=[CWD]/target/release/deps/\
{prefix}foo[..]{suffix} \
--extern foo=CWD/target/release/deps/libfoo.rlib`
--extern foo=[CWD]/target/release/deps/libfoo.rlib`
[FINISHED] release [optimized + debuginfo] target(s) in [..]
",
prefix = env::consts::DLL_PREFIX,

30
tests/testsuite/publish.rs
View file

@ -33,10 +33,10 @@ fn simple() {
[UPDATING] registry `{reg}`
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] foo v0.0.1 (CWD)
[UPLOADING] foo v0.0.1 (CWD)
[PACKAGING] foo v0.0.1 ([CWD])
[UPLOADING] foo v0.0.1 ([CWD])
",
reg = publish::registry()
reg = publish::registry_path().to_str().unwrap()
)).run();
let mut f = File::open(&publish::upload_path().join("api/v1/crates/new")).unwrap();
@ -106,10 +106,10 @@ fn old_token_location() {
[UPDATING] registry `{reg}`
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] foo v0.0.1 (CWD)
[UPLOADING] foo v0.0.1 (CWD)
[PACKAGING] foo v0.0.1 ([CWD])
[UPLOADING] foo v0.0.1 ([CWD])
",
reg = publish::registry()
reg = publish::registry_path().to_str().unwrap()
)).run();
let mut f = File::open(&publish::upload_path().join("api/v1/crates/new")).unwrap();
@ -181,10 +181,10 @@ about this warning.
[UPDATING] registry `{reg}`
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] foo v0.0.1 (CWD)
[UPLOADING] foo v0.0.1 (CWD)
[PACKAGING] foo v0.0.1 ([CWD])
[UPLOADING] foo v0.0.1 ([CWD])
",
reg = publish::registry()
reg = publish::registry_path().to_str().unwrap()
)).run();
let mut f = File::open(&publish::upload_path().join("api/v1/crates/new")).unwrap();
@ -258,10 +258,10 @@ about this warning.
[UPDATING] registry `{reg}`
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] foo v0.0.1 (CWD)
[UPLOADING] foo v0.0.1 (CWD)
[PACKAGING] foo v0.0.1 ([CWD])
[UPLOADING] foo v0.0.1 ([CWD])
",
reg = publish::registry()
reg = publish::registry_path().to_str().unwrap()
)).run();
let mut f = File::open(&publish::upload_path().join("api/v1/crates/new")).unwrap();
@ -604,11 +604,11 @@ fn dry_run() {
[UPDATING] registry `[..]`
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[COMPILING] foo v0.0.1 [..]
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[UPLOADING] foo v0.0.1 (CWD)
[UPLOADING] foo v0.0.1 ([CWD])
[WARNING] aborting upload due to dry run
",
).run();

90
tests/testsuite/registry.rs
View file

@ -40,12 +40,12 @@ fn simple() {
.with_stderr(&format!(
"\
[UPDATING] registry `{reg}`
[DOWNLOADING] bar v0.0.1 (registry `file://[..]`)
[DOWNLOADING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
reg = registry::registry()
reg = registry::registry_path().to_str().unwrap()
)).run();
p.cargo("clean").run();
@ -55,7 +55,7 @@ fn simple() {
.with_stderr(
"\
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -85,14 +85,14 @@ fn deps() {
.with_stderr(&format!(
"\
[UPDATING] registry `{reg}`
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[COMPILING] baz v0.0.1
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
reg = registry::registry()
reg = registry::registry_path().to_str().unwrap()
)).run();
}
@ -272,7 +272,7 @@ Caused by:
failed to download replaced source registry `https://[..]`
Caused by:
failed to verify the checksum of `bad-cksum v0.0.1 (registry `file://[..]`)`
failed to verify the checksum of `bad-cksum v0.0.1 (registry `[ROOT][..]`)`
",
).run();
}
@ -312,12 +312,12 @@ required by package `foo v0.0.1 ([..])`
.with_stderr(format!(
"\
[UPDATING] registry `{reg}`
[DOWNLOADING] notyet v0.0.1 (registry `file://[..]`)
[DOWNLOADING] notyet v0.0.1 (registry `[ROOT][..]`)
[COMPILING] notyet v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
reg = registry::registry()
reg = registry::registry_path().to_str().unwrap()
)).run();
}
@ -364,12 +364,12 @@ required by package `foo v0.0.1 ([..])`
p.cargo("package")
.with_stderr(
"\
[PACKAGING] foo v0.0.1 (CWD)
[VERIFYING] foo v0.0.1 (CWD)
[PACKAGING] foo v0.0.1 ([CWD])
[VERIFYING] foo v0.0.1 ([CWD])
[UPDATING] registry `[..]`
[DOWNLOADING] notyet v0.0.1 (registry `file://[..]`)
[DOWNLOADING] notyet v0.0.1 (registry `[ROOT][..]`)
[COMPILING] notyet v0.0.1
[COMPILING] foo v0.0.1 (CWD[..])
[COMPILING] foo v0.0.1 ([CWD][..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -398,9 +398,9 @@ fn lockfile_locks() {
.with_stderr(
"\
[UPDATING] registry `[..]`
[DOWNLOADING] bar v0.0.1 (registry `file://[..]`)
[DOWNLOADING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -435,11 +435,11 @@ fn lockfile_locks_transitively() {
.with_stderr(
"\
[UPDATING] registry `[..]`
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[COMPILING] baz v0.0.1
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -480,11 +480,11 @@ fn yanks_are_not_used() {
.with_stderr(
"\
[UPDATING] registry `[..]`
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[COMPILING] baz v0.0.1
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -587,7 +587,7 @@ fn update_with_lockfile_if_packages_missing() {
.with_stderr(
"\
[UPDATING] registry `[..]`
[DOWNLOADING] bar v0.0.1 (registry `file://[..]`)
[DOWNLOADING] bar v0.0.1 (registry `[ROOT][..]`)
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -630,9 +630,9 @@ fn update_lockfile() {
p.cargo("build")
.with_stderr(
"\
[DOWNLOADING] [..] v0.0.2 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.2 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.2
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -650,9 +650,9 @@ fn update_lockfile() {
p.cargo("build")
.with_stderr(
"\
[DOWNLOADING] [..] v0.0.3 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.3 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.3
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -728,9 +728,9 @@ fn dev_dependency_not_used() {
.with_stderr(
"\
[UPDATING] registry `[..]`
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
[DOWNLOADING] [..] v0.0.1 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.1
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -812,10 +812,10 @@ fn updating_a_dep() {
.with_stderr(
"\
[UPDATING] registry `[..]`
[DOWNLOADING] bar v0.0.1 (registry `file://[..]`)
[DOWNLOADING] bar v0.0.1 (registry `[ROOT][..]`)
[COMPILING] bar v0.0.1
[COMPILING] a v0.0.1 (CWD/a)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] a v0.0.1 ([CWD]/a)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -838,10 +838,10 @@ fn updating_a_dep() {
.with_stderr(
"\
[UPDATING] registry `[..]`
[DOWNLOADING] bar v0.1.0 (registry `file://[..]`)
[DOWNLOADING] bar v0.1.0 (registry `[ROOT][..]`)
[COMPILING] bar v0.1.0
[COMPILING] a v0.0.1 (CWD/a)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] a v0.0.1 ([CWD]/a)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -892,10 +892,10 @@ fn git_and_registry_dep() {
"\
[UPDATING] [..]
[UPDATING] [..]
[DOWNLOADING] a v0.0.1 (registry `file://[..]`)
[DOWNLOADING] a v0.0.1 (registry `[ROOT][..]`)
[COMPILING] a v0.0.1
[COMPILING] b v0.0.1 ([..])
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -965,9 +965,9 @@ fn update_publish_then_update() {
.with_stderr(
"\
[UPDATING] [..]
[DOWNLOADING] a v0.1.1 (registry `file://[..]`)
[DOWNLOADING] a v0.1.1 (registry `[ROOT][..]`)
[COMPILING] a v0.1.1
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
",
).run();
@ -1036,7 +1036,7 @@ fn update_transitive_dependency() {
p.cargo("build")
.with_stderr(
"\
[DOWNLOADING] b v0.1.1 (registry `file://[..]`)
[DOWNLOADING] b v0.1.1 (registry `[ROOT][..]`)
[COMPILING] b v0.1.1
[COMPILING] a v0.1.0
[COMPILING] foo v0.5.0 ([..])
@ -1139,9 +1139,9 @@ fn update_multiple_packages() {
).run();
p.cargo("build")
.with_stderr_contains("[DOWNLOADING] a v0.1.1 (registry `file://[..]`)")
.with_stderr_contains("[DOWNLOADING] b v0.1.1 (registry `file://[..]`)")
.with_stderr_contains("[DOWNLOADING] c v0.1.1 (registry `file://[..]`)")
.with_stderr_contains("[DOWNLOADING] a v0.1.1 (registry `[ROOT][..]`)")
.with_stderr_contains("[DOWNLOADING] b v0.1.1 (registry `[ROOT][..]`)")
.with_stderr_contains("[DOWNLOADING] c v0.1.1 (registry `[ROOT][..]`)")
.with_stderr_contains("[COMPILING] a v0.1.1")
.with_stderr_contains("[COMPILING] b v0.1.1")
.with_stderr_contains("[COMPILING] c v0.1.1")

6
tests/testsuite/rename_deps.rs
View file

@ -331,10 +331,10 @@ fn can_run_doc_tests() {
.with_stderr_contains(
"\
[DOCTEST] foo
[RUNNING] `rustdoc --test CWD/src/lib.rs \
[RUNNING] `rustdoc --test [CWD]/src/lib.rs \
[..] \
--extern baz=CWD/target/debug/deps/libbar-[..].rlib \
--extern bar=CWD/target/debug/deps/libbar-[..].rlib \
--extern baz=[CWD]/target/debug/deps/libbar-[..].rlib \
--extern bar=[CWD]/target/debug/deps/libbar-[..].rlib \
[..]`
",
).run();

36
tests/testsuite/required_features.rs
View file

@ -274,7 +274,7 @@ fn test_default_features() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]",
).with_stdout_contains("test test ... ok")
@ -327,7 +327,7 @@ fn test_arg_features() {
p.cargo("test --features a")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]",
).with_stdout_contains("test test ... ok")
@ -366,7 +366,7 @@ fn test_multiple_required_features() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo_2-[..][EXE]",
).with_stdout_contains("test test ... ok")
@ -375,7 +375,7 @@ fn test_multiple_required_features() {
p.cargo("test --features c")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo_1-[..][EXE]
[RUNNING] target/debug/deps/foo_2-[..][EXE]",
@ -425,7 +425,7 @@ fn bench_default_features() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_stdout_contains("test bench ... bench: [..]")
@ -490,7 +490,7 @@ fn bench_arg_features() {
p.cargo("bench --features a")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_stdout_contains("test bench ... bench: [..]")
@ -549,7 +549,7 @@ fn bench_multiple_required_features() {
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo_2-[..][EXE]",
).with_stdout_contains("test bench ... bench: [..]")
@ -558,7 +558,7 @@ fn bench_multiple_required_features() {
p.cargo("bench --features c")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo_1-[..][EXE]
[RUNNING] target/release/deps/foo_2-[..][EXE]",
@ -802,7 +802,7 @@ fn dep_feature_in_toml() {
p.cargo("test --test=foo")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]",
).with_stdout_contains("test test ... ok")
@ -813,8 +813,8 @@ fn dep_feature_in_toml() {
p.cargo("bench --bench=foo")
.with_stderr(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_stdout_contains("test bench ... bench: [..]")
@ -920,7 +920,7 @@ Consider enabling them by passing e.g. `--features=\"bar/a\"`
p.cargo("test --test=foo --features bar/a")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]",
).with_stdout_contains("test test ... ok")
@ -936,8 +936,8 @@ Consider enabling them by passing e.g. `--features=\"bar/a\"`
p.cargo("bench --bench=foo --features bar/a")
.with_stderr(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_stdout_contains("test bench ... bench: [..]")
@ -988,7 +988,7 @@ fn test_skips_compiling_bin_with_missing_required_features() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]",
).with_stdout_contains("running 0 tests")
@ -998,7 +998,7 @@ fn test_skips_compiling_bin_with_missing_required_features() {
.with_status(101)
.with_stderr_contains(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
error[E0463]: can't find crate for `bar`",
).run();
@ -1006,7 +1006,7 @@ error[E0463]: can't find crate for `bar`",
p.cargo("bench")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target/release/deps/foo-[..][EXE]",
).with_stdout_contains("running 0 tests")
@ -1016,7 +1016,7 @@ error[E0463]: can't find crate for `bar`",
.with_status(101)
.with_stderr_contains(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
error[E0463]: can't find crate for `bar`",
).run();
}

46
tests/testsuite/run.rs
View file

@ -11,7 +11,7 @@ fn simple() {
p.cargo("run")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/foo[EXE]`",
).with_stdout("hello")
@ -81,7 +81,7 @@ fn exit_code() {
let mut output = String::from(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target[..]`
",
@ -102,7 +102,7 @@ fn exit_code_verbose() {
let mut output = String::from(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target[..]`
@ -181,7 +181,7 @@ fn specify_name() {
p.cargo("run --bin a -v")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc [..] src/lib.rs [..]`
[RUNNING] `rustc [..] src/bin/a.rs [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
@ -318,7 +318,7 @@ fn run_example() {
p.cargo("run --example a")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/examples/a[EXE]`",
).with_stdout("example")
@ -430,7 +430,7 @@ fn run_example_autodiscover_2015_with_autoexamples_enabled() {
.masquerade_as_nightly_cargo()
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/examples/a[EXE]`",
).with_stdout("example")
@ -462,7 +462,7 @@ fn run_example_autodiscover_2018() {
.masquerade_as_nightly_cargo()
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/examples/a[EXE]`",
).with_stdout("example")
@ -556,7 +556,7 @@ fn one_bin_multiple_examples() {
p.cargo("run")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/main[EXE]`",
).with_stdout("hello main.rs")
@ -609,21 +609,21 @@ fn example_with_release_flag() {
p.cargo("run -v --release --example a")
.with_stderr(
"\
[COMPILING] bar v0.5.0 (CWD/bar)
[COMPILING] bar v0.5.0 ([CWD]/bar)
[RUNNING] `rustc --crate-name bar bar/src/bar.rs --crate-type lib \
--emit=dep-info,link \
-C opt-level=3 \
-C metadata=[..] \
--out-dir CWD/target/release/deps \
-L dependency=CWD/target/release/deps`
[COMPILING] foo v0.0.1 (CWD)
--out-dir [CWD]/target/release/deps \
-L dependency=[CWD]/target/release/deps`
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name a examples/a.rs --crate-type bin \
--emit=dep-info,link \
-C opt-level=3 \
-C metadata=[..] \
--out-dir CWD/target/release/examples \
-L dependency=CWD/target/release/deps \
--extern bar=CWD/target/release/deps/libbar-[..].rlib`
--out-dir [CWD]/target/release/examples \
-L dependency=[CWD]/target/release/deps \
--extern bar=[CWD]/target/release/deps/libbar-[..].rlib`
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `target/release/examples/a[EXE]`
",
@ -636,21 +636,21 @@ fast2",
p.cargo("run -v --example a")
.with_stderr(
"\
[COMPILING] bar v0.5.0 (CWD/bar)
[COMPILING] bar v0.5.0 ([CWD]/bar)
[RUNNING] `rustc --crate-name bar bar/src/bar.rs --crate-type lib \
--emit=dep-info,link \
-C debuginfo=2 \
-C metadata=[..] \
--out-dir CWD/target/debug/deps \
-L dependency=CWD/target/debug/deps`
[COMPILING] foo v0.0.1 (CWD)
--out-dir [CWD]/target/debug/deps \
-L dependency=[CWD]/target/debug/deps`
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name a examples/a.rs --crate-type bin \
--emit=dep-info,link \
-C debuginfo=2 \
-C metadata=[..] \
--out-dir CWD/target/debug/examples \
-L dependency=CWD/target/debug/deps \
--extern bar=CWD/target/debug/deps/libbar-[..].rlib`
--out-dir [CWD]/target/debug/examples \
-L dependency=[CWD]/target/debug/deps \
--extern bar=[CWD]/target/debug/deps/libbar-[..].rlib`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target/debug/examples/a[EXE]`
",
@ -709,7 +709,7 @@ fn release_works() {
p.cargo("run --release")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `target/release/foo[EXE]`
",

22
tests/testsuite/rustc.rs
View file

@ -14,12 +14,12 @@ fn build_lib_for_foo() {
p.cargo("rustc --lib -v")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
--emit=dep-info,link -C debuginfo=2 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -35,13 +35,13 @@ fn lib() {
p.cargo("rustc --lib -v -- -C debug-assertions=off")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
--emit=dep-info,link -C debuginfo=2 \
-C debug-assertions=off \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -57,19 +57,19 @@ fn build_main_and_allow_unstable_options() {
p.cargo("rustc -v --bin foo -- -C debug-assertions")
.with_stderr(format!(
"\
[COMPILING] {name} v{version} (CWD)
[COMPILING] {name} v{version} ([CWD])
[RUNNING] `rustc --crate-name {name} src/lib.rs --crate-type lib \
--emit=dep-info,link -C debuginfo=2 \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[RUNNING] `rustc --crate-name {name} src/main.rs --crate-type bin \
--emit=dep-info,link -C debuginfo=2 \
-C debug-assertions \
-C metadata=[..] \
--out-dir [..] \
-L dependency=CWD/target/debug/deps \
--extern {name}=CWD/target/debug/deps/lib{name}-[..].rlib`
-L dependency=[CWD]/target/debug/deps \
--extern {name}=[CWD]/target/debug/deps/lib{name}-[..].rlib`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
name = "foo",
@ -102,7 +102,7 @@ fn build_with_args_to_one_of_multiple_binaries() {
p.cargo("rustc -v --bin bar -- -C debug-assertions")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib --emit=dep-info,link \
-C debuginfo=2 -C metadata=[..] \
--out-dir [..]`
@ -140,7 +140,7 @@ fn build_with_args_to_one_of_multiple_tests() {
p.cargo("rustc -v --test bar -- -C debug-assertions")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib --emit=dep-info,link \
-C debuginfo=2 -C metadata=[..] \
--out-dir [..]`
@ -178,7 +178,7 @@ fn build_foo_with_bar_dependency() {
"\
[COMPILING] bar v0.1.0 ([..])
[RUNNING] `[..] -C debuginfo=2 [..]`
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `[..] -C debuginfo=2 -C debug-assertions [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",

32
tests/testsuite/rustdoc.rs
View file

@ -7,10 +7,10 @@ fn rustdoc_simple() {
p.cargo("rustdoc -v")
.with_stderr(
"\
[DOCUMENTING] foo v0.0.1 (CWD)
[DOCUMENTING] foo v0.0.1 ([CWD])
[RUNNING] `rustdoc --crate-name foo src/lib.rs \
-o CWD/target/doc \
-L dependency=CWD/target/debug/deps`
-o [CWD]/target/doc \
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -23,11 +23,11 @@ fn rustdoc_args() {
p.cargo("rustdoc -v -- --cfg=foo")
.with_stderr(
"\
[DOCUMENTING] foo v0.0.1 (CWD)
[DOCUMENTING] foo v0.0.1 ([CWD])
[RUNNING] `rustdoc --crate-name foo src/lib.rs \
-o CWD/target/doc \
-o [CWD]/target/doc \
--cfg=foo \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -60,11 +60,11 @@ fn rustdoc_foo_with_bar_dependency() {
"\
[CHECKING] bar v0.0.1 ([..])
[RUNNING] `rustc [..]bar/src/lib.rs [..]`
[DOCUMENTING] foo v0.0.1 (CWD)
[DOCUMENTING] foo v0.0.1 ([CWD])
[RUNNING] `rustdoc --crate-name foo src/lib.rs \
-o CWD/target/doc \
-o [CWD]/target/doc \
--cfg=foo \
-L dependency=CWD/target/debug/deps \
-L dependency=[CWD]/target/debug/deps \
--extern [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -98,9 +98,9 @@ fn rustdoc_only_bar_dependency() {
"\
[DOCUMENTING] bar v0.0.1 ([..])
[RUNNING] `rustdoc --crate-name bar [..]bar/src/lib.rs \
-o CWD/target/doc \
-o [CWD]/target/doc \
--cfg=foo \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -118,9 +118,9 @@ fn rustdoc_same_name_documents_lib() {
"\
[DOCUMENTING] foo v0.0.1 ([..])
[RUNNING] `rustdoc --crate-name foo src/lib.rs \
-o CWD/target/doc \
-o [CWD]/target/doc \
--cfg=foo \
-L dependency=CWD/target/debug/deps`
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -163,9 +163,9 @@ fn rustdoc_target() {
[DOCUMENTING] foo v0.0.1 ([..])
[RUNNING] `rustdoc --crate-name foo src/lib.rs \
--target x86_64-unknown-linux-gnu \
-o CWD/target/x86_64-unknown-linux-gnu/doc \
-L dependency=CWD/target/x86_64-unknown-linux-gnu/debug/deps \
-L dependency=CWD/target/debug/deps`
-o [CWD]/target/x86_64-unknown-linux-gnu/doc \
-L dependency=[CWD]/target/x86_64-unknown-linux-gnu/debug/deps \
-L dependency=[CWD]/target/debug/deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]",
).run();
}

4
tests/testsuite/search.rs
View file

@ -154,7 +154,7 @@ wants the location of the index. Please use '--index' instead.
This will soon become a hard error, so it's either recommended
to update to a fixed version or contact the upstream maintainer
about this warning.
[UPDATING] registry `CWD/registry`
[UPDATING] registry `[CWD]/registry`
",
)
.with_stdout_contains(
@ -181,7 +181,7 @@ wants the location of the index. Please use '--index' instead.
This will soon become a hard error, so it's either recommended
to update to a fixed version or contact the upstream maintainer
about this warning.
[UPDATING] registry `CWD/registry`
[UPDATING] registry `[CWD]/registry`
",
)
.with_stdout_contains(

32
tests/testsuite/support/mod.rs
View file

@ -940,9 +940,29 @@ impl Execs {
kind: MatchKind,
) -> MatchResult {
let out = match expected {
Some(out) => out,
Some(out) => {
// Do the template replacements on the expected string.
let replaced = match self.process_builder {
None => out.to_string(),
Some(ref p) => match p.get_cwd() {
None => out.to_string(),
Some(cwd) => out
.replace( "[CWD]", &cwd.display().to_string())
,
},
};
// On Windows, we need to use a wildcard for the drive,
// because we don't actually know what it will be.
let replaced = replaced
.replace("[ROOT]",
if cfg!(windows) { r#"[..]:\"# } else { "/" });
replaced
},
None => return Ok(()),
};
let actual = match str::from_utf8(actual) {
Err(..) => return Err(format!("{} was not utf8 encoded", description)),
Ok(actual) => actual,
@ -950,16 +970,6 @@ impl Execs {
// Let's not deal with \r\n vs \n on windows...
let actual = actual.replace("\r", "");
let actual = actual.replace("\t", "<tab>");
let actual = match self.process_builder {
None => actual,
Some(ref p) => match p.get_cwd() {
None => actual,
Some(cwd) => actual
.replace(&path2url(cwd).to_string(), "CWD")
.replace(&cwd.display().to_string(), "CWD")
,
},
};
match kind {
MatchKind::Exact => {

2
tests/testsuite/support/publish.rs
View file

@ -47,7 +47,7 @@ pub fn setup() -> Repository {
).build()
}
fn registry_path() -> PathBuf {
pub fn registry_path() -> PathBuf {
paths::root().join("registry")
}
pub fn registry() -> Url {

64
tests/testsuite/test.rs
View file

@ -36,7 +36,7 @@ fn cargo_test_simple() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]",
).with_stdout_contains("test test_hello ... ok")
@ -81,9 +81,9 @@ fn cargo_test_release() {
p.cargo("test -v --release")
.with_stderr(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[RUNNING] [..] -C opt-level=3 [..]
[COMPILING] foo v0.1.0 (CWD)
[COMPILING] foo v0.1.0 ([CWD])
[RUNNING] [..] -C opt-level=3 [..]
[RUNNING] [..] -C opt-level=3 [..]
[RUNNING] [..] -C opt-level=3 [..]
@ -150,7 +150,7 @@ fn cargo_test_verbose() {
p.cargo("test -v hello")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc [..] src/main.rs [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `[..]target/debug/deps/foo-[..][EXE] hello`",
@ -218,7 +218,7 @@ fn cargo_test_failing_test_in_bin() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[ERROR] test failed, to rerun pass '--bin foo'",
@ -262,7 +262,7 @@ fn cargo_test_failing_test_in_test() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[RUNNING] target/debug/deps/footest-[..][EXE]
@ -298,7 +298,7 @@ fn cargo_test_failing_test_in_lib() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[ERROR] test failed, to rerun pass '--lib'",
@ -366,7 +366,7 @@ fn test_with_lib_dep() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[RUNNING] target/debug/deps/baz-[..][EXE]
@ -417,7 +417,7 @@ fn test_with_deep_lib_dep() {
.with_stderr(
"\
[COMPILING] bar v0.0.1 ([..])
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target[..]
[DOCTEST] foo",
@ -462,7 +462,7 @@ fn external_test_explicit() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[RUNNING] target/debug/deps/test-[..][EXE]
@ -518,7 +518,7 @@ fn external_test_implicit() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[RUNNING] target/debug/deps/external-[..][EXE]
@ -556,7 +556,7 @@ fn pass_through_command_line() {
p.cargo("test bar")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[DOCTEST] foo",
@ -627,7 +627,7 @@ fn lib_bin_same_name() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[RUNNING] target/debug/deps/foo-[..][EXE]
@ -665,7 +665,7 @@ fn lib_with_standard_name() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] syntax v0.0.1 (CWD)
[COMPILING] syntax v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/syntax-[..][EXE]
[RUNNING] target/debug/deps/test-[..][EXE]
@ -708,7 +708,7 @@ fn lib_with_standard_name2() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] syntax v0.0.1 (CWD)
[COMPILING] syntax v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/syntax-[..][EXE]",
).with_stdout_contains("test test ... ok")
@ -746,7 +746,7 @@ fn lib_without_name() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] syntax v0.0.1 (CWD)
[COMPILING] syntax v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/syntax-[..][EXE]",
).with_stdout_contains("test test ... ok")
@ -1034,8 +1034,8 @@ fn test_dylib() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] bar v0.0.1 (CWD/bar)
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] bar v0.0.1 ([CWD]/bar)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[RUNNING] target/debug/deps/test-[..][EXE]",
@ -1072,7 +1072,7 @@ fn test_twice_with_build_cmd() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[DOCTEST] foo",
@ -1098,7 +1098,7 @@ fn test_then_build() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]
[DOCTEST] foo",
@ -1118,7 +1118,7 @@ fn test_no_run() {
p.cargo("test --no-run")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
@ -1150,7 +1150,7 @@ fn test_run_specific_bin_target() {
prj.cargo("test --bin bin2")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/bin2-[..][EXE]",
).with_stdout_contains("test test2 ... ok")
@ -1187,7 +1187,7 @@ fn test_run_implicit_bin_target() {
prj.cargo("test --bins")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/mybin-[..][EXE]",
).with_stdout_contains("test test_in_bin ... ok")
@ -1206,7 +1206,7 @@ fn test_run_specific_test_target() {
prj.cargo("test --test b")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/b-[..][EXE]",
).with_stdout_contains("test test_b ... ok")
@ -1242,7 +1242,7 @@ fn test_run_implicit_test_target() {
prj.cargo("test --tests")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/mybin-[..][EXE]
[RUNNING] target/debug/deps/mytest-[..][EXE]",
@ -1279,7 +1279,7 @@ fn test_run_implicit_bench_target() {
prj.cargo("test --benches")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/mybin-[..][EXE]
[RUNNING] target/debug/deps/mybench-[..][EXE]",
@ -1384,7 +1384,7 @@ fn test_no_harness() {
p.cargo("test -- --nocapture")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/bar-[..][EXE]
",
@ -1451,7 +1451,7 @@ fn selective_testing() {
p.cargo("test -p d1")
.with_stderr(
"\
[COMPILING] d1 v0.0.1 (CWD/d1)
[COMPILING] d1 v0.0.1 ([CWD]/d1)
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/d1-[..][EXE]
[RUNNING] target/debug/deps/d1-[..][EXE]",
@ -1462,7 +1462,7 @@ fn selective_testing() {
p.cargo("test -p d2")
.with_stderr(
"\
[COMPILING] d2 v0.0.1 (CWD/d2)
[COMPILING] d2 v0.0.1 ([CWD]/d2)
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/d2-[..][EXE]
[RUNNING] target/debug/deps/d2-[..][EXE]",
@ -1473,7 +1473,7 @@ fn selective_testing() {
p.cargo("test")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/foo-[..][EXE]",
).with_stdout_contains("running 0 tests")
@ -1641,7 +1641,7 @@ fn selective_testing_with_docs() {
p.cargo("test -p d1")
.with_stderr(
"\
[COMPILING] d1 v0.0.1 (CWD/d1)
[COMPILING] d1 v0.0.1 ([CWD]/d1)
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target/debug/deps/d1[..][EXE]
[DOCTEST] d1",
@ -1659,7 +1659,7 @@ fn example_bin_same_name() {
p.cargo("test --no-run -v")
.with_stderr(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc [..]`
[RUNNING] `rustc [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]

12
tests/testsuite/tool_paths.rs
View file

@ -23,7 +23,7 @@ fn pathless_tools() {
foo.cargo("build --verbose")
.with_stderr(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc [..] -C ar=nonexistent-ar -C linker=nonexistent-linker [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -64,7 +64,7 @@ fn absolute_tools() {
foo.cargo("build --verbose").with_stderr(&format!(
"\
[COMPILING] foo v0.5.0 (CWD)
[COMPILING] foo v0.5.0 ([CWD])
[RUNNING] `rustc [..] -C ar={root}bogus/nonexistent-ar -C linker={root}bogus/nonexistent-linker [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -107,7 +107,7 @@ fn relative_tools() {
p.cargo("build --verbose").cwd(p.root().join("bar")).with_stderr(&format!(
"\
[COMPILING] bar v0.5.0 (CWD)
[COMPILING] bar v0.5.0 ([CWD])
[RUNNING] `rustc [..] -C ar={prefix}/./nonexistent-ar -C linker={prefix}/./tools/nonexistent-linker [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -138,7 +138,7 @@ fn custom_runner() {
.with_status(101)
.with_stderr_contains(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `nonexistent-runner -r target/debug/foo[EXE] --param`
",
@ -148,7 +148,7 @@ fn custom_runner() {
.with_status(101)
.with_stderr_contains(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `nonexistent-runner -r [..]/target/debug/deps/test-[..][EXE] --param`
@ -159,7 +159,7 @@ fn custom_runner() {
.with_status(101)
.with_stderr_contains(
"\
[COMPILING] foo v0.0.1 (CWD)
[COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc [..]`
[RUNNING] `rustc [..]`
[FINISHED] release [optimized] target(s) in [..]

2
tests/testsuite/workspaces.rs
View file

@ -722,7 +722,7 @@ fn virtual_misconfigure() {
.with_stderr(
"\
error: current package believes it's in a workspace when it's not:
current: CWD/Cargo.toml
current: [CWD]/Cargo.toml
workspace: [..]Cargo.toml
this may be fixable by adding `bar` to the `workspace.members` array of the \