8000 [beta] Rollup backports by pietroalbini · Pull Request #52687 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

[beta] Rollup backports #52687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 26, 2018
Merged

[beta] Rollup backports #52687

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5e53528
Release notes: add some missing 1.28 libs stabilization
SimonSapin Jul 24, 2018
c3c4615
rustdoc: set panic output before starting compiler thread pool
QuietMisdreavus Jul 9, 2018
7f0c8e4
add ui test for failing doctest
QuietMisdreavus Jul 9, 2018
75d0a95
report doctest compile failures correctly
QuietMisdreavus Jul 10, 2018
6457f62
update stdout file with test path normalization
QuietMisdreavus Jul 10, 2018
fb6e8f2
normalize test output so it can be run from repo root
QuietMisdreavus Jul 16, 2018
2cca2f5
add failure-status to rustdoc doctest ui test
QuietMisdreavus Jul 20, 2018
51847e3
compiletest: don't overwrite failure-status if it was previously set
QuietMisdreavus Jul 20, 2018
425b5f4
force the doctest rustc thread to share the name of the test
QuietMisdreavus Jul 24, 2018
0c72464
fix beta backport
pietroalbini Jul 25, 2018
b0f15d3
beta: only true stage0 needs feature(global_allocator)
cuviper Jul 25, 2018
bbeca29
Rollup merge of #52709 - cuviper:beta-global_allocator, r=alexcrichton
kennytm Jul 25, 2018
3fd3221
Run macOS jobs everywhere until Travis has fixed the problem.
kennytm Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add ui test for failing doctest
  • Loading branch information
@QuietMisdreavus @pietroalbini
QuietMisdreavus authored and pietroalbini committed Jul 25, 2018
commit 7f0c8e4cde7bfb423488bdb54917741c04fb565b
19 changes: 19 additions & 0 deletions src/test/rustdoc-ui/failed-doctest-output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Issue #51162: A failed doctest was not printing its stdout/stderr

// compile-flags:--test
// disable-ui-testing-normalization

/// ```
/// panic! 9710 ("oh no");
/// ```
pub struct SomeStruct;
21 changes: 21 additions & 0 deletions src/test/rustdoc-ui/failed-doctest-output.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

running 1 test
test src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 16) ... FAILED

failures:

---- src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 16) stdout ----
thread 'src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 16)' panicked at 'test executable failed:

thread 'main' panicked at 'oh no', src/test/rustdoc-ui/failed-doctest-output.rs:3:1
note: Run with `RUST_BACKTRACE=1` for a backtrace.

', librustdoc/test.rs:367:17
note: Run with `RUST_BACKTRACE=1` for a backtrace.


failures:
src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 16)

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

0