Francois Gouget : winetest: Add support for reports containing pids.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 17eb1e231e34be789d3e457f58f582ed097b38bd
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=17eb1e231e34be789d3e457f5...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Thu Feb 16 12:35:44 2017 +0100

winetest: Add support for reports containing pids.

Let dissect recognize the test result lines despite the extra pid field
but do not yet put it to use.  Also make the 'tests executed' regexp a
bit stricter.

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

---

 winetest/dissect | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index d9404fe..a4f3f99 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -306,7 +306,7 @@ while (<IN>) {
             $dll = undef;
             mydie "too many tests skipped by user request\n" if ++$user_skips > $maxuserskips;
         }
-    } elsif (/^(.*$unit.*: (\d+) tests executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\.)\r?$/) {
+    } elsif (/^((?:[0-9a-f]+:)?$unit: (\d+) tests executed \((\d+) marked as todo, (\d+) failures?\), (\d+) skipped\.)\r?$/) {
         $lines++;
         $total += $2;
         $todo += $3;
@@ -318,7 +318,7 @@ while (<IN>) {
         if ($failed) { $class .= " failed"; }
         elsif ($todo) { $class .= " todo"; }
         $testbox->{data} .= sprintf "<div class=\"%s\">%s</div>\n", $class, escapeHTML($_);
-    } elsif (/$dll:$unit done \((-?\d+)\)(?:\r?$| in)/) {
+    } elsif (/$dll:$unit(?::[0-9a-f]+)? done \((-?\d+)\)(?:\r?$| in)/) {
         chomp;                  # current test ended
         if ($lines==0 || $1 < 0) {
             $result = "failed $1 - -";