bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

limit special FileCheck revision checks

Browse source
This commit is contained in:
Davis Muro 2025-01-02 18:27:07 -08:00
parent 891041fbc9
commit 4a5e76a70e
No known key found for this signature in database
GPG key ID: E733EF073829DCA1
2 changed files with 51 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tools/compiletest/src/header.rs
View file

@ -951,10 +951,12 @@ impl Config {
raw,
testfile.display()
);
} else if FORBIDDEN_REVISION_NAMES.contains(&revision.as_str()) {
} else if matches!(self.mode, Mode::Assembly | Mode::Codegen | Mode::MirOpt)
&& FORBIDDEN_REVISION_NAMES.contains(&revision.as_str())
{
panic!(
"invalid revision: `{}` in line `{}`: {}",
revision,
"revision name `{revision}` is not permitted in a test suite that uses `FileCheck` annotations\n\
as it is confusing when used as custom `FileCheck` prefix: `{revision}` in line `{}`: {}",
raw,
testfile.display()
);

54
src/tools/compiletest/src/header/tests.rs
View file

@ -554,16 +554,54 @@ fn test_duplicate_revisions() {
}
#[test]
fn test_forbidden_revisions() {
let config: Config = cfg().build();
#[should_panic(
expected = "revision name `CHECK` is not permitted in a test suite that uses `FileCheck` annotations"
)]
fn test_assembly_mode_forbidden_revisions() {
let config = cfg().mode("assembly").build();
parse_rs(&config, "//@ revisions: CHECK");
}
#[test]
#[should_panic(
expected = "revision name `CHECK` is not permitted in a test suite that uses `FileCheck` annotations"
)]
fn test_codegen_mode_forbidden_revisions() {
let config = cfg().mode("codegen").build();
parse_rs(&config, "//@ revisions: CHECK");
}
#[test]
#[should_panic(
expected = "revision name `CHECK` is not permitted in a test suite that uses `FileCheck` annotations"
)]
fn test_miropt_mode_forbidden_revisions() {
let config = cfg().mode("mir-opt").build();
parse_rs(&config, "//@ revisions: CHECK");
}
#[test]
fn test_forbidden_revisions_allowed_in_non_filecheck_dir() {
let revisions = ["CHECK", "COM", "NEXT", "SAME", "EMPTY", "NOT", "COUNT", "DAG", "LABEL"];
let modes = [
"pretty",
"debuginfo",
"rustdoc",
"rustdoc-json",
"codegen-units",
"incremental",
"ui",
"js-doc-test",
"coverage-map",
"coverage-run",
"crashes",
];
for rev in revisions {
let res = std::panic::catch_unwind(|| {
parse_rs(&config, format!("//@ revisions: {rev}").as_str());
});
assert!(res.is_err());
if let Some(msg) = res.unwrap_err().downcast_ref::<String>() {
assert!(msg.contains(format!("invalid revision: `{rev}` in line ` {rev}`").as_str()))
let content = format!("//@ revisions: {rev}");
for mode in modes {
let config = cfg().mode(mode).build();
parse_rs(&config, &content);
}
}
}