Francois Gouget : testbot/WineRunWineTest: Ignore other errors if we get a badpatch error.
Alexandre Julliard
julliard at winehq.org
Wed Jun 27 12:45:44 CDT 2018
Module: tools
Branch: master
Commit: fe21cd684df78ab570bb2a59b7ed42c51fb81510
URL: https://source.winehq.org/git/tools.git/?a=commit;h=fe21cd684df78ab570bb2a59b7ed42c51fb81510
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Jun 27 08:03:46 2018 +0200
testbot/WineRunWineTest: Ignore other errors if we get a badpatch error.
Just like finding a success line in the task log proves that it was
successful no matter what happened before, a 'badpatch' line
conclusively determines the task status.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/bin/WineRunWineTest.pl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl
index 0aba7ec..53a2a09 100755
--- a/testbot/bin/WineRunWineTest.pl
+++ b/testbot/bin/WineRunWineTest.pl
@@ -356,8 +356,8 @@ if (!$Pid)
#
-# From that point on we want to at least try to grab the task
-# log before giving up
+# From that point on we want to at least try to grab the task log
+# before giving up
#
my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut);
@@ -391,7 +391,9 @@ if ($TA->GetFile("Task.log", "$TaskDir/log"))
}
elsif ($Result eq "badpatch")
{
+ # This too is conclusive enough to ignore other errors.
$NewStatus = "badpatch";
+ $TAError = $ErrMessage = undef;
}
elsif ($Result =~ s/^nolog://)
{
More information about the wine-cvs
mailing list