Skip to content

Commit df96fb1

Browse files
committed
Auto merge of rust-lang#92309 - ehuss:remove-check_lines, r=Mark-Simulacrum
compiletest: Remove some vestigial code The `check_lines` header is no longer parsed as a header, but instead inside the debuginfo tests. I believe this was changed in rust-lang#13726.
2 parents 2b67c30 + 4d6bb4d commit df96fb1

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

Diff for: src/tools/compiletest/src/header.rs

-11
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ pub struct TestProps {
7878
pub unset_rustc_env: Vec<String>,
7979
// Environment settings to use during execution
8080
pub exec_env: Vec<(String, String)>,
81-
// Lines to check if they appear in the expected debugger output
82-
pub check_lines: Vec<String>,
8381
// Build documentation for all specified aux-builds as well
8482
pub build_aux_docs: bool,
8583
// Flag to force a crate to be built with the host architecture
@@ -165,7 +163,6 @@ impl TestProps {
165163
rustc_env: vec![],
166164
unset_rustc_env: vec![],
167165
exec_env: vec![],
168-
check_lines: vec![],
169166
build_aux_docs: false,
170167
force_host: false,
171168
check_stdout: false,
@@ -318,10 +315,6 @@ impl TestProps {
318315
self.unset_rustc_env.push(ev);
319316
}
320317

321-
if let Some(cl) = config.parse_check_line(ln) {
322-
self.check_lines.push(cl);
323-
}
324-
325318
if let Some(of) = config.parse_forbid_output(ln) {
326319
self.forbid_output.push(of);
327320
}
@@ -555,10 +548,6 @@ impl Config {
555548
self.parse_name_value_directive(line, "run-flags")
556549
}
557550

558-
fn parse_check_line(&self, line: &str) -> Option<String> {
559-
self.parse_name_value_directive(line, "check")
560-
}
561-
562551
fn parse_force_host(&self, line: &str) -> bool {
563552
self.parse_name_directive(line, "force-host")
564553
}

0 commit comments

Comments
 (0)