Francois Gouget : testbot: Remove support for TestAgent's old "skipped" lines.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue Aug 20 12:08:48 2019 +0200

testbot: Remove support for TestAgent's old "skipped" lines.

TestAgent was fixed a couple of years ago so the TestBot should not have
to deal with such lines anymore.

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

---

 testbot/lib/WineTestBot/LogUtils.pm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index b75607a..3dca2e4 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -351,16 +351,14 @@ sub ParseWineTestReport($$$)
       _CheckUnit($Parser, $Cur, $1, "todo");
       $Cur->{LineTodos}++;
     }
-    # TestLauncher's skip message is quite broken
-    elsif ($Line =~ /^([_a-z0-9]+)(?:\.c)?:\d+:? Tests? skipped: / or
+    elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: / or
            ($Cur->{Unit} ne "" and
-            $Line =~ /($Cur->{Unit})(?:\.c)?:\d+:? Tests? skipped: /))
+            $Line =~ /($Cur->{Unit})\.c:\d+: Tests skipped: /))
     {
       my $Unit = $1;
       # Don't complain and don't count misplaced skips. Only complain if they
-      # are misreported (see _CloseTestUnit). Also TestLauncher uses the wrong
-      # name in its skip message when skipping tests.
-      if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "" or $Unit eq $Cur->{Dll})
+      # are misreported (see _CloseTestUnit).
+      if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "")
       {
         $Cur->{LineSkips}++;
       }
@@ -396,9 +394,8 @@ sub ParseWineTestReport($$$)
       my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5);
 
       # Dlls that have only one test unit will run it even if there is
-      # no argument. Also TestLauncher uses the wrong name in its test
-      # summary line when skipping tests.
-      if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "" or $Unit eq $Cur->{Dll})
+      # no argument.
+      if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "")
       {
         # There may be more than one summary line due to child processes
         $Cur->{Pids}->{$Pid || 0} = 1;