From 316fcbd217b2edfbc78220b10b4f603a4fc0bdff Mon Sep 17 00:00:00 2001 From: Zalathar Date: Fri, 3 Apr 2026 15:34:22 +1100 Subject: [PATCH] Check diagnostic output in incremental `cpass` and `rpass` revisions This allows warnings to be annotated, and verifies that no unexpected warnings occur. --- src/tools/compiletest/src/runtest/incremental.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/tools/compiletest/src/runtest/incremental.rs b/src/tools/compiletest/src/runtest/incremental.rs index 0c773c49b604..812f63625f98 100644 --- a/src/tools/compiletest/src/runtest/incremental.rs +++ b/src/tools/compiletest/src/runtest/incremental.rs @@ -1,5 +1,4 @@ use super::{FailMode, ProcRes, TestCx, WillExecute}; -use crate::errors; impl TestCx<'_> { pub(super) fn run_incremental_test(&self) { @@ -57,10 +56,7 @@ fn run_cpass_test(&self) { self.fatal_proc_rec("compilation failed!", &proc_res); } - // FIXME(#41968): Move this check to tidy? - if !errors::load_errors(&self.testpaths.file, self.revision).is_empty() { - self.fatal("build-pass tests with expected warnings should be moved to ui/"); - } + self.check_compiler_output_for_incr(&proc_res); } fn run_rpass_test(&self) { @@ -72,10 +68,7 @@ fn run_rpass_test(&self) { self.fatal_proc_rec("compilation failed!", &proc_res); } - // FIXME(#41968): Move this check to tidy? - if !errors::load_errors(&self.testpaths.file, self.revision).is_empty() { - self.fatal("run-pass tests with expected warnings should be moved to ui/"); - } + self.check_compiler_output_for_incr(&proc_res); if let WillExecute::Disabled = should_run { return;