Stop using line_directive in runtest::debugger

This also removes unused support for `[rev]` in debugger commands, and makes
breakpoint detection slightly more sensible.

Author: Zalathar

src/tools/compiletest/src/runtest/debugger.rs

@@ -4,7 +4,6 @@ use std::io::{BufRead, BufReader};
 use std::path::{Path,PathBuf};
 
 usecrate::common::Config;
-usecrate::header::line_directive;
 usecrate::runtest::ProcRes;
 
 /// Representation of information to invoke a debugger and check its output
@@ -24,7 +23,6 @@ impl DebuggerCommands {
 file:&Path,
 config:&Config,
 debugger_prefixes:&[&str],
-rev:Option<&str>,
 ) -> Result<Self,String>{
 let directives = debugger_prefixes
 .iter()
@@ -39,18 +37,17 @@ impl DebuggerCommands {
 for(line_no, line)in reader.lines().enumerate(){
  counter += 1;
 let line = line.map_err(|e| format!("Error while parsing debugger commands: {}", e))?;
-let(lnrev, line) = line_directive("//",&line).unwrap_or((None,&line));
-
-// Skip any revision specific directive that doesn't match the current
-// revision being tested
-if lnrev.is_some() && lnrev != rev {
-continue;
-}
 
+// Breakpoints appear on lines with actual code, typically at the end of the line.
 if line.contains("#break"){
  breakpoint_lines.push(counter);
+continue;
 }
 
+letSome(line) = line.trim_start().strip_prefix("//").map(str::trim_start)else{
+continue;
+};
+
 for&(ref command_directive,ref check_directive)in&directives {
  config
 .parse_name_value_directive(&line, command_directive)

src/tools/compiletest/src/runtest/debuginfo.rs

@@ -66,13 +66,8 @@ impl TestCx<'_> {
 };
 
 // Parse debugger commands etc from test files
-let dbg_cmds = DebuggerCommands::parse_from(
-&self.testpaths.file,
-self.config,
- prefixes,
-self.revision,
-)
-.unwrap_or_else(|e| self.fatal(&e));
+let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file,self.config, prefixes)
+.unwrap_or_else(|e| self.fatal(&e));
 
 // https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/debugger-commands
 letmut script_str = String::with_capacity(2048);
@@ -142,13 +137,8 @@ impl TestCx<'_> {
 }
 
 fnrun_debuginfo_gdb_test_no_opt(&self){
-let dbg_cmds = DebuggerCommands::parse_from(
-&self.testpaths.file,
-self.config,
-&["gdb"],
-self.revision,
-)
-.unwrap_or_else(|e| self.fatal(&e));
+let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file,self.config,&["gdb"])
+.unwrap_or_else(|e| self.fatal(&e));
 letmut cmds = dbg_cmds.commands.join("\n");
 
 // compile test file (it should have 'compile-flags:-g' in the header)
@@ -413,13 +403,8 @@ impl TestCx<'_> {
 }
 
 // Parse debugger commands etc from test files
-let dbg_cmds = DebuggerCommands::parse_from(
-&self.testpaths.file,
-self.config,
-&["lldb"],
-self.revision,
-)
-.unwrap_or_else(|e| self.fatal(&e));
+let dbg_cmds = DebuggerCommands::parse_from(&self.testpaths.file,self.config,&["lldb"])
+.unwrap_or_else(|e| self.fatal(&e));
 
 // Write debugger script:
 // We don't want to hang when calling `quit` while the process is still running