Add normalization for thread IDs in panic messages

So we don't need to add normalization to every test that includes a
panic message, add a global normalization to compiletest.
This commit is contained in:
Trevor Gross 2025-06-13 20:31:34 +00:00
parent 7d82b83ed5
commit 0c8b3870bd
2 changed files with 7 additions and 1 deletions

View file

@ -2567,6 +2567,11 @@ impl<'test> TestCx<'test> {
})
.into_owned();
// Normalize thread IDs in panic messages
normalized = static_regex!(r"thread '(?P<name>.*?)' \((rtid )?\d+\) panicked")
.replace_all(&normalized, "thread '$name' ($$TID) panicked")
.into_owned();
normalized = normalized.replace("\t", "\\t"); // makes tabs visible
// Remove test annotations like `//~ ERROR text` from the output,

View file

@ -248,7 +248,8 @@ regexes! {
// erase alloc ids
"alloc[0-9]+" => "ALLOC",
// erase thread ids
r"unnamed-[0-9]+" => "unnamed-ID",
r"unnamed-[0-9]+" => "unnamed-ID",
r"thread '(?P<name>.*?)' \(\d+\) panicked" => "thread '$name' ($$TID) panicked",
// erase borrow tags
"<[0-9]+>" => "<TAG>",
"<[0-9]+=" => "<TAG=",