itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use deprecated rustdoc flags in tests

Browse Source 
In rust-lang/rust#44138 we are adding deprecations, and so it
breaks these tests.
This commit is contained in:
steveklabnik 2017-08-30 10:50:40 -04:00
parent b52468241e
commit b1e8298bc6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/rustdoc.rs
View File

@ -38,14 +38,14 @@ fn rustdoc_args() {
"#)
.file("src/lib.rs", r#" "#);
assert_that(p.cargo_process("rustdoc").arg("-v").arg("--").arg("--no-defaults"),
assert_that(p.cargo_process("rustdoc").arg("-v").arg("--").arg("--cfg=foo"),
execs()
.with_status(0)
.with_stderr(format!("\
[DOCUMENTING] foo v0.0.1 ({url})
[RUNNING] `rustdoc --crate-name foo src[/]lib.rs \
-o {dir}[/]target[/]doc \
--no-defaults \
--cfg=foo \
-L dependency={dir}[/]target[/]debug[/]deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
", dir = p.root().display(), url = p.url())));
@ -81,7 +81,7 @@ fn rustdoc_foo_with_bar_dependency() {
"#);
bar.build();
assert_that(foo.cargo_process("rustdoc").arg("-v").arg("--").arg("--no-defaults"),
assert_that(foo.cargo_process("rustdoc").arg("-v").arg("--").arg("--cfg=foo"),
execs()
.with_status(0)
.with_stderr(format!("\
@ -90,7 +90,7 @@ fn rustdoc_foo_with_bar_dependency() {
[DOCUMENTING] foo v0.0.1 ({url})
[RUNNING] `rustdoc --crate-name foo src[/]lib.rs \
-o {dir}[/]target[/]doc \
--no-defaults \
--cfg=foo \
-L dependency={dir}[/]target[/]debug[/]deps \
--extern [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
@ -128,14 +128,14 @@ fn rustdoc_only_bar_dependency() {
bar.build();
assert_that(foo.cargo_process("rustdoc").arg("-v").arg("-p").arg("bar")
.arg("--").arg("--no-defaults"),
.arg("--").arg("--cfg=foo"),
execs()
.with_status(0)
.with_stderr(format!("\
[DOCUMENTING] bar v0.0.1 ([..])
[RUNNING] `rustdoc --crate-name bar [..]bar[/]src[/]lib.rs \
-o {dir}[/]target[/]doc \
--no-defaults \
--cfg=foo \
-L dependency={dir}[/]target[/]debug[/]deps`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
", dir = foo.root().display())));
@ -157,7 +157,7 @@ fn rustdoc_same_name_err() {
.file("src/lib.rs", r#" "#);
assert_that(p.cargo_process("rustdoc").arg("-v")
.arg("--").arg("--no-defaults"),
.arg("--").arg("--cfg=foo"),
execs()
.with_status(101)
.with_stderr("[ERROR] cannot document a package where a library and a \