File tree Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Original file line number Diff line number Diff 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,
Original file line number Diff line number Diff 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=" ,
You can’t perform that action at this time.
0 commit comments