Skip to content

Remove non-working code for "running" mir-opt tests #155641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 2 commits into from
Apr 23, 2026
+12 −36
Merged

Remove non-working code for "running" mir-opt tests #155641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8172f47
Remove non-working code for "running" mir-opt tests
Zalathar Apr 22, 2026
1a3c6b4
Don't pass `local_pm` to `compile_test_general`
Zalathar Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,9 @@ impl<'test> TestCx<'test> {

fn should_run(&self, pm: Option<PassMode>) -> WillExecute {
let test_should_run = match self.config.mode {
TestMode::Ui
if pm == Some(PassMode::Run)
|| matches!(self.props.fail_mode, Some(FailMode::Run(_))) =>
{
true
TestMode::Ui => {
pm == Some(PassMode::Run) || matches!(self.props.fail_mode, Some(FailMode::Run(_)))
}
TestMode::MirOpt if pm == Some(PassMode::Run) => true,
TestMode::Ui | TestMode::MirOpt => false,
mode => panic!("unimplemented for mode {:?}", mode),
};
if test_should_run { self.run_if_enabled() } else { WillExecute::No }
Expand All @@ -314,7 +309,7 @@ impl<'test> TestCx<'test> {

fn should_run_successfully(&self, pm: Option<PassMode>) -> bool {
match self.config.mode {
TestMode::Ui | TestMode::MirOpt => pm == Some(PassMode::Run),
TestMode::Ui => pm == Some(PassMode::Run),
mode => panic!("unimplemented for mode {:?}", mode),
}
}
Expand Down Expand Up @@ -935,23 +930,13 @@ impl<'test> TestCx<'test> {
}

fn compile_test(&self, will_execute: WillExecute, emit: Emit) -> ProcRes {
self.compile_test_general(will_execute, emit, self.props.local_pass_mode(), Vec::new())
}

fn compile_test_with_passes(
&self,
will_execute: WillExecute,
emit: Emit,
passes: Vec<String>,
) -> ProcRes {
self.compile_test_general(will_execute, emit, self.props.local_pass_mode(), passes)
self.compile_test_general(will_execute, emit, Vec::new())
}

fn compile_test_general(
&self,
will_execute: WillExecute,
emit: Emit,
local_pm: Option<PassMode>,
passes: Vec<String>,
) -> ProcRes {
let compiler_kind = self.compiler_kind_for_non_aux();
Expand All @@ -975,7 +960,7 @@ impl<'test> TestCx<'test> {
// Note that we use the local pass mode here as we don't want
// to set unused to allow if we've overridden the pass mode
// via command line flags.
&& local_pm != Some(PassMode::Run)
&& self.props.local_pass_mode() != Some(PassMode::Run)
{
AllowUnused::Yes
} else {
Expand Down
13 changes: 1 addition & 12 deletions src/tools/compiletest/src/runtest/mir_opt.rs
View file
Open in desktop
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Off-topic:

Attempting to "run" these tests (e.g. with ./x test mir-opt --pass=run)
therefore fails when the OS notices that a MIR text file is not executable.

Clearly the OS is not brave enough then smh

Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ use crate::runtest::compute_diff::write_diff;

impl TestCx<'_> {
pub(super) fn run_mir_opt_test(&self) {
let pm = self.pass_mode();
let should_run = self.should_run(pm);

let mut test_info = files_for_miropt_test(
&self.testpaths.file.as_std_path(),
self.config.get_pointer_width(),
Expand All @@ -21,19 +18,11 @@ impl TestCx<'_> {

let passes = std::mem::take(&mut test_info.passes);

let proc_res = self.compile_test_with_passes(should_run, Emit::Mir, passes);
let proc_res = self.compile_test_general(WillExecute::No, Emit::Mir, passes);
if !proc_res.status.success() {
self.fatal_proc_rec("compilation failed!", &proc_res);
}
self.check_mir_dump(test_info);

if let WillExecute::Yes = should_run {
let proc_res = self.exec_compiled_test();

if !proc_res.status.success() {
self.fatal_proc_rec("test run failed!", &proc_res);
}
}
}

fn check_mir_dump(&self, test_info: MiroptTest) {
Expand Down
10 changes: 6 additions & 4 deletions src/tools/compiletest/src/runtest/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ impl TestCx<'_> {
pub(super) fn run_ui_test(&self) {
if let Some(FailMode::Build) = self.props.fail_mode {
// Make sure a build-fail test cannot fail due to failing analysis (e.g. typeck).
let pm = Some(PassMode::Check);
let proc_res =
self.compile_test_general(WillExecute::No, Emit::Metadata, pm, Vec::new());
self.check_if_test_should_compile(self.props.fail_mode, pm, &proc_res);
let proc_res = self.compile_test(WillExecute::No, Emit::Metadata);
self.check_if_test_should_compile(
self.props.fail_mode,
Some(PassMode::Check),
&proc_res,
);
}

let pm = self.pass_mode();
Expand Down
Loading