Francois Gouget : testbot: Also report the 'succeeded inside todo block' lines.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 9ebc103b54f5719a3a0a11bde54fdb5e81dbf500
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=9ebc103b54f5719a3a0a11bde...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Wed Mar 29 00:36:20 2017 +0200

testbot: Also report the 'succeeded inside todo block' lines.

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

---

 testbot/bin/WineRunTask.pl | 4 ++--
 testbot/web/JobDetails.pl  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 7357c06..dec73a6 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -483,9 +483,9 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
         }
         ($CurrentDll, $CurrentUnit) = ($Dll, $Unit);
       }
-      elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test failed: / or
+      elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or
              ($CurrentUnit ne "" and
-              $Line =~ /($CurrentUnit)\.c:\d+: Test failed: /))
+              $Line =~ /($CurrentUnit)\.c:\d+: Test (?:failed|succeeded inside todo block): /))
       {
         my $Unit = $1;
         if ($Unit eq $CurrentUnit)
diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl
index 1d47763..c5803ed 100644
--- a/testbot/web/JobDetails.pl
+++ b/testbot/web/JobDetails.pl
@@ -349,7 +349,8 @@ sub GenerateBody($)
         {
           $CurrentDll = $1;
         }
-        if ($FullLog || $Line =~ m/: Test failed: / ||
+        if ($FullLog ||
+            $Line =~ m/: Test (?:failed|succeeded inside todo block): / ||
             $Line =~ m/Fatal: test '[^']+' does not exist/ ||
             $Line =~ m/ done \(258\)/ ||
             $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /)