[tools] testbot/TestWTBS: Fix matching regexps in patches.

Francois Gouget fgouget at codeweavers.com
Mon Mar 1 09:25:46 CST 2021


That step was getting skipped for patches submitted through the
mailing list, i.e. whenever CheckJobTree() was first called from
CheckPatch() (which checks the patches/* files) rather than straight
from CheckJobs().

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
Sending the 100+ wtbsuite test cases is normally done through
WinePatches*Submit.pl, that is as if coming from the mailing list,
resulting in that check being skipped.
Found thanks to the testwtbsuite test suite.
---
 testbot/tests/TestWTBS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS
index 6a19f138b..daeb36eaa 100755
--- a/testbot/tests/TestWTBS
+++ b/testbot/tests/TestWTBS
@@ -1126,10 +1126,6 @@ sub CheckJobTree($;$)
 
       $TestInfo = LoadTestInfo($Step->GetFullFileName());
       return if (!$TestInfo);
-      if ($TestInfo->{patch})
-      {
-        GrepFile($Job->Id, $Job->GetDir(), "patch.diff", $TestInfo->{patch});
-      }
     }
 
     my $TaskType = $Step->Type eq "build" ? "build" :
@@ -1164,6 +1160,10 @@ sub CheckJobTree($;$)
       }
     }
   }
+  if ($TestInfo->{patch})
+  {
+    GrepFile($Job->Id, $Job->GetDir(), "patch.diff", $TestInfo->{patch});
+  }
   if ($Email->{HasFailedEmail})
   {
     foreach my $VMName (sort keys %FailedVMs)
-- 
2.20.1




More information about the wine-devel mailing list