diff options
| -rw-r--r-- | src/test/ui/lint/lint-type-overflow2.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/proc-macro/auxiliary/generate-mod.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/save-analysis/emit-notifications.rs | 3 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 13 | ||||
| -rw-r--r-- | src/tools/compiletest/src/main.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 28 |
6 files changed, 24 insertions, 24 deletions
diff --git a/src/test/ui/lint/lint-type-overflow2.rs b/src/test/ui/lint/lint-type-overflow2.rs index 684df604205..c1f874c079c 100644 --- a/src/test/ui/lint/lint-type-overflow2.rs +++ b/src/test/ui/lint/lint-type-overflow2.rs @@ -2,7 +2,6 @@ #![deny(overflowing_literals)] #![deny(const_err)] -#![allow(unused_variables)] fn main() { let x2: i8 = --128; //~ ERROR literal out of range for `i8` diff --git a/src/test/ui/proc-macro/auxiliary/generate-mod.rs b/src/test/ui/proc-macro/auxiliary/generate-mod.rs index 8b41e8b3b3e..e950f7d62d6 100644 --- a/src/test/ui/proc-macro/auxiliary/generate-mod.rs +++ b/src/test/ui/proc-macro/auxiliary/generate-mod.rs @@ -1,6 +1,7 @@ // run-pass // force-host // no-prefer-dynamic +// ignore-pass #![crate_type = "proc-macro"] diff --git a/src/test/ui/save-analysis/emit-notifications.rs b/src/test/ui/save-analysis/emit-notifications.rs index 411acbb14db..ebc27174998 100644 --- a/src/test/ui/save-analysis/emit-notifications.rs +++ b/src/test/ui/save-analysis/emit-notifications.rs @@ -1,4 +1,7 @@ // compile-pass // compile-flags: -Zsave-analysis -Zemit-artifact-notifications // compile-flags: --crate-type rlib --error-format=json +// ignore-pass +// ^-- needed because otherwise, the .stderr file changes with --pass check + pub fn foo() {} diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 8202218f7d1..52f777db2da 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -350,9 +350,9 @@ pub struct TestProps { // arguments. (In particular, it propagates to the aux-builds.) pub incremental_dir: Option<PathBuf>, // How far should the test proceed while still passing. - pub pass_mode: Option<PassMode>, + pass_mode: Option<PassMode>, // Ignore `--pass` overrides from the command line for this test. - pub ignore_pass: bool, + ignore_pass: bool, // rustdoc will test the output of the `--test` option pub check_test_line_numbers_match: bool, // Do not pass `-Z ui-testing` to UI tests @@ -608,6 +608,15 @@ impl TestProps { (_, None) => {} } } + + pub fn pass_mode(&self, config: &Config) -> Option<PassMode> { + if !self.ignore_pass { + if let (mode @ Some(_), Some(_)) = (config.force_pass_mode, self.pass_mode) { + return mode; + } + } + self.pass_mode + } } fn iter_header(testfile: &Path, cfg: Option<&str>, it: &mut dyn FnMut(&str)) { diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 288853d5e18..597fdf2d95e 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -328,7 +328,7 @@ pub fn parse_config(args: Vec<String>) -> Config { filter_exact: matches.opt_present("exact"), force_pass_mode: matches.opt_str("pass").map(|mode| mode.parse::<PassMode>() - .unwrap_or_else(|_| panic!("unknown `--pass` option `{}` given.", mode)) + .unwrap_or_else(|_| panic!("unknown `--pass` option `{}` given", mode)) ), logfile: matches.opt_str("logfile").map(|s| PathBuf::from(&s)), runtool: matches.opt_str("runtool"), diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 270420991e9..cb586632426 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -211,7 +211,6 @@ pub fn run(config: Config, testpaths: &TestPaths, revision: Option<&str>) { props: &props, testpaths, revision: revision, - is_aux: false, }; create_dir_all(&cx.output_base_dir()).unwrap(); @@ -230,7 +229,6 @@ pub fn run(config: Config, testpaths: &TestPaths, revision: Option<&str>) { props: &revision_props, testpaths, revision: Some(revision), - is_aux: false, }; rev_cx.run_revision(); } @@ -262,7 +260,7 @@ pub fn compute_stamp_hash(config: &Config) -> String { env::var_os("PYTHONPATH").hash(&mut hash); } - if let Ui | RunPass = config.mode { + if let Ui | RunPass | Incremental = config.mode { config.force_pass_mode.hash(&mut hash); } @@ -274,7 +272,6 @@ struct TestCx<'test> { props: &'test TestProps, testpaths: &'test TestPaths, revision: Option<&'test str>, - is_aux: bool, } struct DebuggerCommands { @@ -316,18 +313,13 @@ impl<'test> TestCx<'test> { } } - fn effective_pass_mode(&self) -> Option<PassMode> { - if !self.props.ignore_pass { - if let (mode @ Some(_), Some(_)) = (self.config.force_pass_mode, self.props.pass_mode) { - return mode; - } - } - self.props.pass_mode + fn pass_mode(&self) -> Option<PassMode> { + self.props.pass_mode(self.config) } fn should_run_successfully(&self) -> bool { match self.config.mode { - RunPass | Ui => self.effective_pass_mode() == Some(PassMode::Run), + RunPass | Ui => self.pass_mode() == Some(PassMode::Run), mode => panic!("unimplemented for mode {:?}", mode), } } @@ -337,7 +329,7 @@ impl<'test> TestCx<'test> { CompileFail => false, RunPass => true, JsDocTest => true, - Ui => self.props.pass_mode.is_some(), + Ui => self.pass_mode().is_some(), Incremental => { let revision = self.revision .expect("incremental tests require a list of revisions"); @@ -345,7 +337,7 @@ impl<'test> TestCx<'test> { true } else if revision.starts_with("cfail") { // FIXME: would be nice if incremental revs could start with "cpass" - self.props.pass_mode.is_some() + self.pass_mode().is_some() } else { panic!("revision name must begin with rpass, rfail, or cfail"); } @@ -1356,7 +1348,7 @@ impl<'test> TestCx<'test> { fn check_error_patterns(&self, output_to_check: &str, proc_res: &ProcRes) { debug!("check_error_patterns"); if self.props.error_patterns.is_empty() { - if self.props.pass_mode.is_some() { + if self.pass_mode().is_some() { return; } else { self.fatal(&format!( @@ -1578,7 +1570,6 @@ impl<'test> TestCx<'test> { props: &aux_props, testpaths: &aux_testpaths, revision: self.revision, - is_aux: true, }; // Create the directory for the stdout/stderr files. create_dir_all(aux_cx.output_base_dir()).unwrap(); @@ -1748,7 +1739,6 @@ impl<'test> TestCx<'test> { props: &aux_props, testpaths: &aux_testpaths, revision: self.revision, - is_aux: true, }; // Create the directory for the stdout/stderr files. create_dir_all(aux_cx.output_base_dir()).unwrap(); @@ -1989,8 +1979,7 @@ impl<'test> TestCx<'test> { } } - let pass_mode = if self.is_aux { self.props.pass_mode } else { self.effective_pass_mode() }; - if let Some(PassMode::Check) = pass_mode { + if let Some(PassMode::Check) = self.pass_mode() { rustc.args(&["--emit", "metadata"]); } @@ -2728,7 +2717,6 @@ impl<'test> TestCx<'test> { props: &revision_props, testpaths: self.testpaths, revision: self.revision, - is_aux: false, }; if self.config.verbose { |