The testbot.log error messages have no common prefix such as 'error:' which makes them hard to identify. Expand GetLogLineCategory() to identify the most important ones.
Signed-off-by: Francois Gouget fgouget@codeweavers.com ---
Error handling in the WineRun* scripts is all wrong :-( I'll submit a patch to sort it out 'soon' but that won't help with the existing testbot.log files. So this patch is here to take care of those.
As is it will only have an effect on the new jobs though. To have the TestBot website show the correct testbot.log error summaries for past jobs, the matching .errors files need to be rebuilt using UpdateTaskLogs. For instance:
cd testbot/var ../bin/UpdateTaskLogs --debug --rebuild 2>&1 | tee UpdateTaskLogs.log
testbot/lib/WineTestBot/LogUtils.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9bde76c6c6..2128c97986 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -86,7 +86,11 @@ sub GetLogLineCategory($) $Line =~ /^+ \S/ or $Line =~ /^LANG=/ or $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests|Updated)/) + $Line =~ /^Task: (?:ok|tests|Updated)/ or + # testbot.log information messages + $Line =~ /^----- Run / or + $Line =~ /^The test VM has crashed/ or # Context for an error message + $Line =~ /^The previous \d+ run(s) terminated abnormally/) { return "info"; } @@ -101,7 +105,12 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^Task: / or # Typical perl errors - _IsPerlError($Line)) + _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$/) { return "error"; }
-
Francois Gouget