Skip to content

Commit

Permalink
Auto merge of #62797 - petrochenkov:run-pass-hole, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
tests: Require run-pass tests without annotations to run successfully again

Fixes #62775 (regression from #61755)
  • Loading branch information
bors committed Jul 21, 2019
2 parents 273f42b + b5af947 commit 25035ca
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/test/run-pass/backtrace-debuginfo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// ignore-emscripten spawning processes is not supported
// normalize-stderr-test ".*\n" -> ""
// ignore-sgx no processes
// ignore-msvc issue #62844

// Note that above `-opt-bisect-limit=0` is used to basically disable
// optimizations. It creates tons of output on stderr, hence we normalize
Expand Down
5 changes: 5 additions & 0 deletions src/test/run-pass/command-uid-gid.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// ignore-android
// ignore-cloudabi
// ignore-emscripten
// ignore-sgx

#![feature(rustc_private)]

fn main() {
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/generator/size-moved-locals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
// See issue #59123 for a full explanation.

// edition:2018
// ignore-wasm32

#![feature(generators, generator_trait)]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Make sure that the mono-item collector does not crash when trying to
// instantiate a default impl for DecodeUtf16<<u8 as A>::Item>
// See https://github.com/rust-lang/rust/issues/58375

// build-pass
// compile-flags:-C link-dead-code

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

impl Arbitrary for DecodeUtf16<<u8 as A>::Item> {
}
impl Arbitrary for DecodeUtf16<<u8 as A>::Item> {}
4 changes: 3 additions & 1 deletion src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,10 @@ impl<'test> TestCx<'test> {
}

fn should_run_successfully(&self) -> bool {
let pass_mode = self.pass_mode();
match self.config.mode {
RunPass | Ui => self.pass_mode() == Some(PassMode::Run),
Ui => pass_mode == Some(PassMode::Run),
RunPass => pass_mode == Some(PassMode::Run) || pass_mode.is_none(),
mode => panic!("unimplemented for mode {:?}", mode),
}
}
Expand Down

0 comments on commit 25035ca

Please sign in to comment.