Skip to content

Commit 8c6f4dc

Browse files
committed
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.
1 parent de031bb commit 8c6f4dc

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2524,6 +2524,11 @@ impl<'test> TestCx<'test> {
25242524
})
25252525
.into_owned();
25262526

2527+
// Normalize thread IDs in panic messages
2528+
normalized = static_regex!(r"thread '(?P<name>.*?)' \((rtid )?\d+\) panicked")
2529+
.replace_all(&normalized, "thread '$name' ($$TID) panicked")
2530+
.into_owned();
2531+
25272532
normalized = normalized.replace("\t", "\\t"); // makes tabs visible
25282533

25292534
// Remove test annotations like `//~ ERROR text` from the output,

src/tools/miri/tests/ui.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ regexes! {
248248
// erase alloc ids
249249
"alloc[0-9]+" => "ALLOC",
250250
// erase thread ids
251-
r"unnamed-[0-9]+" => "unnamed-ID",
251+
r"unnamed-[0-9]+" => "unnamed-ID",
252+
r"thread '(?P<name>.*?)' \(\d+\) panicked" => "thread '$name' ($$TID) panicked",
252253
// erase borrow tags
253254
"<[0-9]+>" => "<TAG>",
254255
"<[0-9]+=" => "<TAG=",

0 commit comments

Comments
 (0)