bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

normalize test output so it can be run from repo root

Browse source
This commit is contained in:
QuietMisdreavus 2018-07-16 16:25:34 -05:00
parent ffbd2b931e
commit d965371d86
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/rustdoc-ui/failed-doctest-output.rs
View file

@ -9,15 +9,19 @@
// except according to those terms. // except according to those terms.
// Issue #51162: A failed doctest was not printing its stdout/stderr // Issue #51162: A failed doctest was not printing its stdout/stderr
// FIXME: if/when the output of the test harness can be tested on its own, this test should be
// adapted to use that, and that normalize line can go away
// compile-flags:--test // compile-flags:--test
// disable-ui-testing-normalization // normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
// doctest fails at runtime
/// ``` /// ```
/// panic!("oh no"); /// panic!("oh no");
/// ``` /// ```
pub struct SomeStruct; pub struct SomeStruct;
// doctest fails at compile time
/// ``` /// ```
/// no /// no
/// ``` /// ```

18
src/test/rustdoc-ui/failed-doctest-output.stdout
View file

@ -1,22 +1,22 @@
running 2 tests running 2 tests
test $DIR/failed-doctest-output.rs - OtherStruct (line 21) ... FAILED test $DIR/failed-doctest-output.rs - OtherStruct (line 25) ... FAILED
test $DIR/failed-doctest-output.rs - SomeStruct (line 16) ... FAILED test $DIR/failed-doctest-output.rs - SomeStruct (line 19) ... FAILED
failures: failures:
---- $DIR/failed-doctest-output.rs - OtherStruct (line 21) stdout ---- ---- $DIR/failed-doctest-output.rs - OtherStruct (line 25) stdout ----
error[E0425]: cannot find value `no` in this scope error[E0425]: cannot find value `no` in this scope
--> $DIR/failed-doctest-output.rs:22:1 --> $DIR/failed-doctest-output.rs:26:1
| |
3 | no 3 | no
| ^^ not found in this scope | ^^ not found in this scope
thread '$DIR/failed-doctest-output.rs - OtherStruct (line 21)' panicked at 'couldn't compile the test', librustdoc/test.rs:332:13 thread '$DIR/failed-doctest-output.rs - OtherStruct (line 25)' panicked at 'couldn't compile the test', librustdoc/test.rs:332:13
note: Run with `RUST_BACKTRACE=1` for a backtrace. note: Run with `RUST_BACKTRACE=1` for a backtrace.
---- $DIR/failed-doctest-output.rs - SomeStruct (line 16) stdout ---- ---- $DIR/failed-doctest-output.rs - SomeStruct (line 19) stdout ----
thread '$DIR/failed-doctest-output.rs - SomeStruct (line 16)' panicked at 'test executable failed: thread '$DIR/failed-doctest-output.rs - SomeStruct (line 19)' panicked at 'test executable failed:
thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1 thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1
note: Run with `RUST_BACKTRACE=1` for a backtrace. note: Run with `RUST_BACKTRACE=1` for a backtrace.
@ -25,8 +25,8 @@ note: Run with `RUST_BACKTRACE=1` for a backtrace.
failures: failures:
$DIR/failed-doctest-output.rs - OtherStruct (line 21) $DIR/failed-doctest-output.rs - OtherStruct (line 25)
$DIR/failed-doctest-output.rs - SomeStruct (line 16) $DIR/failed-doctest-output.rs - SomeStruct (line 19)
test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out