Skip to content

Commit 529828e

Browse files
committed
Auto merge of #62797 - petrochenkov:run-pass-hole, r=Mark-Simulacrum
tests: Require run-pass tests without annotations to run successfully again Fixes #62775 (regression from #61755)
2 parents 83dfe7b + b5af947 commit 529828e

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

src/test/run-pass/backtrace-debuginfo.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// ignore-emscripten spawning processes is not supported
1313
// normalize-stderr-test ".*\n" -> ""
1414
// ignore-sgx no processes
15+
// ignore-msvc issue #62844
1516

1617
// Note that above `-opt-bisect-limit=0` is used to basically disable
1718
// optimizations. It creates tons of output on stderr, hence we normalize

src/test/run-pass/command-uid-gid.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// ignore-android
2+
// ignore-cloudabi
3+
// ignore-emscripten
4+
// ignore-sgx
5+
16
#![feature(rustc_private)]
27

38
fn main() {

src/test/run-pass/generator/size-moved-locals.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// See issue #59123 for a full explanation.
1010

1111
// edition:2018
12+
// ignore-wasm32
1213

1314
#![feature(generators, generator_trait)]
1415

src/test/run-pass/issue-58375-monomorphize-default-impls.rs src/test/ui/issues/issue-58375-monomorphize-default-impls.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Make sure that the mono-item collector does not crash when trying to
22
// instantiate a default impl for DecodeUtf16<<u8 as A>::Item>
33
// See https://github.com/rust-lang/rust/issues/58375
4+
5+
// build-pass
46
// compile-flags:-C link-dead-code
57

68
#![crate_type = "rlib"]
@@ -19,5 +21,4 @@ impl A for u8 {
1921
type Item = char;
2022
}
2123

22-
impl Arbitrary for DecodeUtf16<<u8 as A>::Item> {
23-
}
24+
impl Arbitrary for DecodeUtf16<<u8 as A>::Item> {}

src/tools/compiletest/src/runtest.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,10 @@ impl<'test> TestCx<'test> {
318318
}
319319

320320
fn should_run_successfully(&self) -> bool {
321+
let pass_mode = self.pass_mode();
321322
match self.config.mode {
322-
RunPass | Ui => self.pass_mode() == Some(PassMode::Run),
323+
Ui => pass_mode == Some(PassMode::Run),
324+
RunPass => pass_mode == Some(PassMode::Run) || pass_mode.is_none(),
323325
mode => panic!("unimplemented for mode {:?}", mode),
324326
}
325327
}

0 commit comments

Comments
 (0)