run-pass tests shouldn't have unused contents

This commit is contained in:
Mark Rousskov 2019-09-01 17:05:02 -04:00
parent 43a5ff4222
commit 072942d569
2 changed files with 10 additions and 1 deletions

View File

@ -628,6 +628,11 @@ impl TestProps {
}
self.pass_mode
}
// does not consider CLI override for pass mode
pub fn local_pass_mode(&self) -> Option<PassMode> {
self.pass_mode
}
}
fn iter_header(testfile: &Path, cfg: Option<&str>, it: &mut dyn FnMut(&str)) {

View File

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