diff options
| author | bors <bors@rust-lang.org> | 2022-02-25 08:40:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-25 08:40:34 +0000 |
| commit | 03c8ffaacb040a8753ef8e1accea701bc9f5be85 (patch) | |
| tree | 243ffcf7568eceb6515c48a28f5d78b8a3a05038 /src/tools | |
| parent | ece55d416e65256e4da274988651c20e5d5cb4ea (diff) | |
| parent | cff3472ef1d21ca2ed5be4c8f6444df3967c61a8 (diff) | |
| download | rust-03c8ffaacb040a8753ef8e1accea701bc9f5be85.tar.gz rust-03c8ffaacb040a8753ef8e1accea701bc9f5be85.zip | |
Auto merge of #94350 - matthiaskrgr:rollup-eesfiyr, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #92714 (Provide ignore message in the result of test) - #93273 (Always check cg_llvm with ./x.py check) - #94068 (Consider mutations as borrows in generator drop tracking) - #94184 (BTree: simplify test code) - #94297 (update const_generics_defaults release notes) - #94341 (Remove a duplicate space) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 887d27fd6dc..2c2239f2b83 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -806,6 +806,8 @@ pub fn make_test_description<R: Read>( cfg: Option<&str>, ) -> test::TestDesc { let mut ignore = false; + #[cfg(not(bootstrap))] + let ignore_message: Option<String> = None; let mut should_fail = false; let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some(); @@ -877,6 +879,8 @@ pub fn make_test_description<R: Read>( test::TestDesc { name, ignore, + #[cfg(not(bootstrap))] + ignore_message, should_panic, compile_fail: false, no_run: false, |