Francois Gouget : testbot/LogUtils: Simplify matching the WineRun* errors.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Mar  5 12:17:05 2021 +0100

testbot/LogUtils: Simplify matching the WineRun* errors.

They now start with the script name and the ':error:' prefix.
Remove the 'Could not create' regexp since it actually corresponds to a
VM-side 'Task:' error which is already taken into account.

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

---

 testbot/lib/WineTestBot/LogUtils.pm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index bdba8da..4e9b733 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -106,11 +106,8 @@ sub GetLogLineCategory($)
       $Line =~ /^Task: / or
       # Typical perl errors
       _IsPerlError($Line) or
-      # The main testbot.log errors
-      $Line =~ /^An error occurred while / or
-      $Line =~ /^Could not create / or
-      $Line =~ /^Giving up after \d+ run\(s\)$/ or
-      $Line =~ /^The (?:build|task) timed out$/)
+      # The testbot.log errors
+      $Line =~ /:error: /)
   {
     return "error";
   }