Skip to content

Commit

Permalink
Auto merge of #9730 - hi-rustin:rustin-patch-doc-test, r=alexcrichton
Browse files Browse the repository at this point in the history
doc test supports silent output

close #9728
  • Loading branch information
bors committed Jul 27, 2021
2 parents d21c228 + 8ee5433 commit cdf22d1
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/cargo/ops/cargo_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ fn run_doc_tests(
p.arg("--test-args").arg(arg);
}

if config.shell().verbosity() == Verbosity::Quiet {
p.arg("--test-args").arg("--quiet");
}

p.args(args);

if *unstable_opts {
Expand Down
67 changes: 67 additions & 0 deletions tests/testsuite/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,73 @@ fn cargo_test_quiet_no_harness() {
p.cargo("test -q").with_stdout("").with_stderr("").run();
}

#[cargo_test]
fn cargo_doc_test_quiet() {
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
authors = []
"#,
)
.file(
"src/lib.rs",
r#"
/// ```
/// let result = foo::add(2, 3);
/// assert_eq!(result, 5);
/// ```
pub fn add(a: i32, b: i32) -> i32 {
a + b
}
/// ```
/// let result = foo::div(10, 2);
/// assert_eq!(result, 5);
/// ```
///
/// # Panics
///
/// The function panics if the second argument is zero.
///
/// ```rust,should_panic
/// // panics on division by zero
/// foo::div(10, 0);
/// ```
pub fn div(a: i32, b: i32) -> i32 {
if b == 0 {
panic!("Divide-by-zero error");
}
a / b
}
#[test] fn test_hello() {}
"#,
)
.build();

p.cargo("test -q")
.with_stdout(
"
running 1 test
.
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
running 3 tests
...
test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
",
)
.with_stderr("")
.run();
}

#[cargo_test]
fn cargo_test_verbose() {
let p = project()
Expand Down

0 comments on commit cdf22d1

Please sign in to comment.