[Tools] winetest: Add support for reports containing pids.
Francois Gouget
fgouget at codeweavers.com
Wed Feb 8 09:43:09 CST 2017
This patch just lets dissect recognize the test result lines despite the
extra pid field but does not yet put it to use.
It also makes the 'tests executed' regexp a bit stricter.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
winetest/dissect | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/winetest/dissect b/winetest/dissect
index d9404fe2..8ef31b01 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 (/^($unit:(?:0x[0-9a-f]+)? (\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(?::0x[0-9a-f]+)? done \((-?\d+)\)(?:\r?$| in)/) {
chomp; # current test ended
if ($lines==0 || $1 < 0) {
$result = "failed $1 - -";
--
2.11.0
More information about the wine-patches
mailing list