Francois Gouget : testbot/TestWTBS: Allow ignoring inherited error lists.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Tue Mar  2 15:41:36 2021 +0100

testbot/TestWTBS: Allow ignoring inherited error lists.

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

---

 testbot/tests/TestWTBS | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS
index e9fa98e..81b56c4 100755
--- a/testbot/tests/TestWTBS
+++ b/testbot/tests/TestWTBS
@@ -678,6 +678,17 @@ Finally, note that while the error directives are inherited by subcategories,
 they are not merged. So if if both win and win32 have error-matching
 directives, win32 will not inherit anything from the win category.
 
+=item <tasks.(report|log|testbot).Errors>
+
+Inheritance of the reference error lists cannot be prevented but can be ignored
+by setting this property to 'ignore'.
+
+For instance:
+g 0 build.log.
+n 0 Task: The exe32 Wine build failed
+p wine:build.log.Errors ignore
+a wine:build.log.Grep ^Task: The (win32|wow64) Wine build failed
+
 =cut
 
 sub CheckLogErrors($$$$)
@@ -957,9 +968,11 @@ sub CheckTask($$$$)
       $LogType = "testbot";
     }
 
-    if ($MissionInfo->{"$LogType.errors"} or $CheckTimeouts)
+    my $RefErrors = SkipCheck($MissionInfo->{"$LogType.Errors"}) ? undef :
+                    $MissionInfo->{"$LogType.errors"};
+    if ($RefErrors or $CheckTimeouts)
     {
-      my $HasTimeout = CheckLogErrors($LogInfo, $MissionInfo->{"$LogType.errors"},
+      my $HasTimeout = CheckLogErrors($LogInfo, $RefErrors,
                                       TaskKeyStr($Task) ."/$LogName",
                                       $MissionInfo->{HasTimeout});
       $TimeoutCount++ if ($HasTimeout);