Francois Gouget : testbot/web: Detect and highlight some more Git errors.
Alexandre Julliard
julliard at winehq.org
Fri Jun 22 05:44:24 CDT 2018
Module: tools
Branch: master
Commit: d993054560052b5a1e146a5971ea24d975ed8ace
URL: https://source.winehq.org/git/tools.git/?a=commit;h=d993054560052b5a1e146a5971ea24d975ed8ace
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Thu Jun 21 14:25:08 2018 +0200
testbot/web: Detect and highlight some more Git errors.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/web/JobDetails.pl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl
index 8cc354e..410d186 100644
--- a/testbot/web/JobDetails.pl
+++ b/testbot/web/JobDetails.pl
@@ -253,9 +253,12 @@ sub GetHtmlLine($$$)
$Line =~ / done \(258\)/ or
$Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or
$Line =~ /^Unhandled exception: / or
+ # Git errors
+ $Line =~ /^CONFLICT / or
+ $Line =~ /^error: patch failed:/ or
+ $Line =~ /^error: corrupt patch / or
# Build errors
$Line =~ /: error: / or
- $Line =~ /^error: patch failed:/ or
$Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or
$Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or
# Typical perl errors
More information about the wine-cvs
mailing list