From a625ddd1ed250a32690ce739997706b3bfd7e2ec Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Sat, 28 Dec 2024 23:37:48 +1100
Subject: [PATCH 1/2] Remove the unused `cdbg-*` debugger directive prefix
There are no tests in `tests/debuginfo` that use this prefix.
---
src/tools/compiletest/src/runtest/debuginfo.rs | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/tools/compiletest/src/runtest/debuginfo.rs b/src/tools/compiletest/src/runtest/debuginfo.rs
index c621c22ac993c..7f1f85ba730d8 100644
--- a/src/tools/compiletest/src/runtest/debuginfo.rs
+++ b/src/tools/compiletest/src/runtest/debuginfo.rs
@@ -59,14 +59,8 @@ impl TestCx<'_> {
return;
}
- let prefixes = {
- static PREFIXES: &[&str] = &["cdb", "cdbg"];
- // No "native rust support" variation for CDB yet.
- PREFIXES
- };
-
// Parse debugger commands etc from test files
- let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file, self.config, prefixes)
+ let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file, self.config, &["cdb"])
.unwrap_or_else(|e| self.fatal(&e));
// https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/debugger-commands
From 2f8824a477f8b4ec51a3365c2d68f525032b8241 Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Sat, 28 Dec 2024 23:43:41 +1100
Subject: [PATCH 2/2] Simplify `DebuggerCommands::parse_from` to only take one
prefix
---
src/tools/compiletest/src/runtest/debugger.rs | 25 ++++++-------------
.../compiletest/src/runtest/debuginfo.rs | 6 ++---
2 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/tools/compiletest/src/runtest/debugger.rs b/src/tools/compiletest/src/runtest/debugger.rs
index c15422fb6f684..d9e5c3fa0d8fa 100644
--- a/src/tools/compiletest/src/runtest/debugger.rs
+++ b/src/tools/compiletest/src/runtest/debugger.rs
@@ -19,15 +19,9 @@ pub(super) struct DebuggerCommands {
}
impl DebuggerCommands {
- pub fn parse_from(
- file: &Path,
- config: &Config,
- debugger_prefixes: &[&str],
- ) -> Result<Self, String> {
- let directives = debugger_prefixes
- .iter()
- .map(|prefix| (format!("{prefix}-command"), format!("{prefix}-check")))
- .collect::<Vec<_>>();
+ pub fn parse_from(file: &Path, config: &Config, debugger_prefix: &str) -> Result<Self, String> {
+ let command_directive = format!("{debugger_prefix}-command");
+ let check_directive = format!("{debugger_prefix}-check");
let mut breakpoint_lines = vec![];
let mut commands = vec![];
@@ -48,14 +42,11 @@ impl DebuggerCommands {
continue;
};
- for &(ref command_directive, ref check_directive) in &directives {
- config
- .parse_name_value_directive(&line, command_directive)
- .map(|cmd| commands.push(cmd));
-
- config
- .parse_name_value_directive(&line, check_directive)
- .map(|cmd| check_lines.push((line_no, cmd)));
+ if let Some(command) = config.parse_name_value_directive(&line, &command_directive) {
+ commands.push(command);
+ }
+ if let Some(pattern) = config.parse_name_value_directive(&line, &check_directive) {
+ check_lines.push((line_no, pattern));
}
}
diff --git a/src/tools/compiletest/src/runtest/debuginfo.rs b/src/tools/compiletest/src/runtest/debuginfo.rs
index 7f1f85ba730d8..b236b06756903 100644
--- a/src/tools/compiletest/src/runtest/debuginfo.rs
+++ b/src/tools/compiletest/src/runtest/debuginfo.rs
@@ -60,7 +60,7 @@ impl TestCx<'_> {
}
// Parse debugger commands etc from test files
- let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file, self.config, &["cdb"])
+ let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file, self.config, "cdb")
.unwrap_or_else(|e| self.fatal(&e));
// https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/debugger-commands
@@ -131,7 +131,7 @@ impl TestCx<'_> {
}
fn run_debuginfo_gdb_test_no_opt(&self) {
- let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file, self.config, &["gdb"])
+ let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file, self.config, "gdb")
.unwrap_or_else(|e| self.fatal(&e));
let mut cmds = dbg_cmds.commands.join("\n");
@@ -397,7 +397,7 @@ impl TestCx<'_> {
}
// Parse debugger commands etc from test files
- let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file, self.config, &["lldb"])
+ let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file, self.config, "lldb")
.unwrap_or_else(|e| self.fatal(&e));
// Write debugger script: