Skip to content

Commit 072942d

Browse files
run-pass tests shouldn't have unused contents
1 parent 43a5ff4 commit 072942d

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/tools/compiletest/src/header.rs

+5
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,11 @@ impl TestProps {
628628
}
629629
self.pass_mode
630630
}
631+
632+
// does not consider CLI override for pass mode
633+
pub fn local_pass_mode(&self) -> Option<PassMode> {
634+
self.pass_mode
635+
}
631636
}
632637

633638
fn iter_header(testfile: &Path, cfg: Option<&str>, it: &mut dyn FnMut(&str)) {

src/tools/compiletest/src/runtest.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1557,7 +1557,11 @@ impl<'test> TestCx<'test> {
15571557
// want to actually assert warnings about all this code. Instead
15581558
// let's just ignore unused code warnings by defaults and tests
15591559
// can turn it back on if needed.
1560-
if !self.config.src_base.ends_with("rustdoc-ui") {
1560+
if !self.config.src_base.ends_with("rustdoc-ui") &&
1561+
// Note that we don't call pass_mode() here as we don't want
1562+
// to set unused to allow if we've overriden the pass mode
1563+
// via command line flags.
1564+
self.props.local_pass_mode() != Some(PassMode::Run) {
15611565
rustc.args(&["-A", "unused"]);
15621566
}
15631567
}

0 commit comments

Comments
 (0)