Francois Gouget : testbot/TestWTBS: Fix matching regexps in patches.
Alexandre Julliard
julliard at winehq.org
Mon Mar 1 15:28:34 CST 2021
Module: tools
Branch: master
Commit: 356f927fa3f7ee292648b16cd2a7da61714f16b8
URL: https://source.winehq.org/git/tools.git/?a=commit;h=356f927fa3f7ee292648b16cd2a7da61714f16b8
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Mar 1 16:25:46 2021 +0100
testbot/TestWTBS: Fix matching regexps in patches.
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>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/tests/TestWTBS | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS
index 0a4f84d..5069355 100755
--- a/testbot/tests/TestWTBS
+++ b/testbot/tests/TestWTBS
@@ -1097,10 +1097,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" :
@@ -1135,6 +1131,10 @@ sub CheckJobTree($;$)
}
}
}
+ if ($TestInfo->{patch})
+ {
+ GrepFile($Job->Id, $Job->GetDir(), "patch.diff", $TestInfo->{patch});
+ }
if ($Email->{HasFailedEmail})
{
foreach my $VMName (sort keys %FailedVMs)
More information about the wine-cvs
mailing list