Francois Gouget : testbot/WineRunTask: Recognize skipped test units.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed May 24 23:56:37 2017 +0200

testbot/WineRunTask: Recognize skipped test units.

In case we need to skip test units in the TestBot VMs.

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

---

 testbot/bin/WineRunTask.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index f8e6977..12b83f2 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -564,14 +564,17 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
 
     foreach my $Line (<$LogFile>)
     {
-      if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%)
+      if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%)
       {
-        my ($Dll, $Unit) = ($1, $2);
+        my ($Dll, $Unit, $Type) = ($1, $2, $3);
 
         # Close the previous test unit
         CloseTestUnit(0) if ($CurrentDll ne "");
 
         ($CurrentDll, $CurrentUnit) = ($Dll, $Unit);
+
+        # Recognize skipped messages in case we need to skip tests in the VMs
+        $CurrentRc = 0 if ($Type eq "skipped");
       }
       elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or
              ($CurrentUnit ne "" and