Francois Gouget : winetest/dissect: Link child exception lines to the source.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 87fc19727444032b7607d0263b3ebdc02f733cb2
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=87fc19727444032b7607d0263b3ebdc02f733cb2

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Feb 12 17:22:43 2021 +0100

winetest/dissect: Link child exception lines to the source.

Move the trace handling because it also matches the child exception
lines now.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 winetest/dissect | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index c1590ba..d2ef10d 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -661,15 +661,6 @@ while ($line = <IN>) {
         # Don't complain and don't count misplaced skips
         $skipped++ if ($units{$l_unit});
     }
-    elsif (($unit ne "" and
-            $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or
-           $line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/)
-    {
-        my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4);
-        add_test_line("trace", escapeHTML($pollution) .
-                               get_source_link($l_unit, $l_num) .": ".
-                               escapeHTML($l_text));
-    }
     elsif (($unit ne "" and
             $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /) or
            $line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /)
@@ -694,20 +685,31 @@ while ($line = <IN>) {
         add_test_line("failed", escapeHTML($line));
     }
     elsif (($unit ne "" and
-            $line =~ /($units_re):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or
-           $line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/)
+            $line =~ /^(.*?)($units_re)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) or
+           $line =~ /^()([_.a-z0-9]+)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/)
     {
-        my ($l_unit, $l_pid) = ($1, $2);
+        my ($pollution, $l_unit, $l_num, $l_text, $l_pid) = ($1, $2, $3, $4, $5);
         if ($units{$l_unit})
         {
           # This also replaces a test summary line.
           $pids{$l_pid || 0} = 1;
           $s_failures++;
         }
-        add_test_line("failed", escapeHTML($line));
+        add_test_line("failed", escapeHTML($pollution) .
+                                get_source_link($l_unit, $l_num) .": ".
+                                escapeHTML($l_text));
         check_unit($l_unit, "child exception");
         $failures++;
     }
+    elsif (($unit ne "" and
+            $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or
+           $line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/)
+    {
+        my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4);
+        add_test_line("trace", escapeHTML($pollution) .
+                               get_source_link($l_unit, $l_num) .": ".
+                               escapeHTML($l_text));
+    }
     elsif (($unit ne "" and
             $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./) or
            $line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./)