Rollup merge of #61199 - ollie27:rustdoc_cfg_test, r=QuietMisdreavus
Revert "Set test flag when rustdoc is running with --test option" Reverts https://github.com/rust-lang/rust/pull/59940. It caused doctests in this repository to no longer be tested including all of the core crate.
This commit is contained in:
commit
6c0ab739fb
6 changed files with 15 additions and 12 deletions
|
|
@ -2,12 +2,15 @@
|
|||
// compile-flags:--test
|
||||
// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
|
||||
|
||||
// Crates like core have doctests gated on `cfg(not(test))` so we need to make
|
||||
// sure `cfg(test)` is not active when running `rustdoc --test`.
|
||||
|
||||
/// this doctest will be ignored:
|
||||
///
|
||||
/// ```
|
||||
/// assert!(false);
|
||||
/// ```
|
||||
#[cfg(not(test))]
|
||||
#[cfg(test)]
|
||||
pub struct Foo;
|
||||
|
||||
/// this doctest will be tested:
|
||||
|
|
@ -15,5 +18,5 @@ pub struct Foo;
|
|||
/// ```
|
||||
/// assert!(true);
|
||||
/// ```
|
||||
#[cfg(test)]
|
||||
#[cfg(not(test))]
|
||||
pub struct Foo;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
running 1 test
|
||||
test $DIR/cfg-test.rs - Foo (line 15) ... ok
|
||||
test $DIR/cfg-test.rs - Foo (line 18) ... ok
|
||||
|
||||
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue