Francois Gouget : winetest: Tweak dissect to better match the TestBot WineTest log parser.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue Aug 20 12:08:59 2019 +0200

winetest: Tweak dissect to better match the TestBot WineTest log parser.

This puts exception handling in the same relative spot, making it easier
to compare the two codebases.

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

---

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

diff --git a/winetest/dissect b/winetest/dissect
index 2bd95eb..e5b2815 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -609,21 +609,6 @@ while ($line = <IN>) {
             $rc = 0;
         }
     }
-    elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or
-           ($unit ne "" and
-            $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /))
-    {
-        my ($l_pid, $l_unit) = ($1, $2);
-        if ($l_unit eq $unit)
-        {
-          # This also replaces a test summary line.
-          $pids{$l_pid || 0} = 1;
-          $s_failures++;
-        }
-        add_test_line("failed", escapeHTML($line));
-        check_unit($l_unit, "unhandled exception");
-        $failures++;
-    }
     elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or
            ($unit ne "" and
             $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/))
@@ -664,6 +649,21 @@ while ($line = <IN>) {
                                get_source_link($l_unit, $l_num) .": ".
                                escapeHTML($l_text));
     }
+    elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or
+           ($unit ne "" and
+            $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /))
+    {
+        my ($l_pid, $l_unit) = ($1, $2);
+        if ($l_unit eq $unit)
+        {
+          # This also replaces a test summary line.
+          $pids{$l_pid || 0} = 1;
+          $s_failures++;
+        }
+        add_test_line("failed", escapeHTML($line));
+        check_unit($l_unit, "unhandled exception");
+        $failures++;
+    }
     elsif ($line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./ or
            ($unit ne "" and
             $line =~ /(?:([0-9a-f]+):)?($unit): (\d+) tests? executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\./))