Francois Gouget : testbot/WineSendLog: Fix identifying and reporting timeouts to the mailing list.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Jul 13 12:07:04 2018 +0200

testbot/WineSendLog: Fix identifying and reporting timeouts to the mailing list.

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

---

 testbot/bin/WineSendLog.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index f095bce..ac14e11 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -139,9 +139,9 @@ sub ReadLog($$$)
       while (! $Found && defined($Line = <LOG>))
       {
         $Line =~ s/[\r\n]*$//;
-        if ($Line =~ m/${BaseName}:${TestSet} done/)
+        if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done/)
         {
-          if ($Line =~ m/${BaseName}:${TestSet} done \(258\)/)
+          if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done \(258\)/)
           {
             push @Messages, "The test timed out";
           }
@@ -192,7 +192,7 @@ sub CompareLogs($$$$)
       {
         if ($Line =~ m/: Test failed: / || 
             $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at / ||
-            $Line =~ m/Timeout/i)
+            $Line =~ m/The test timed out/)
         {
           $Messages .= "$Line\n";
         }
@@ -301,7 +301,7 @@ EOF
             print SENDMAIL "\n$CurrentDll:\n";
             $PrintedDll = $CurrentDll;
           }
-          if ($Line =~ m/^[^:]+:([^ ]+) done \(258\)/)
+          if ($Line =~ m/^[^:]+:([^ ]+)(?::[0-9a-f]+)? done \(258\)/)
           {
             print SENDMAIL "$1: The test timed out\n";
           }