Francois Gouget : testbot/WineRunTask: Preserve the old WineTest report in case of timeout.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jun 21 14:32:23 2018 +0200

testbot/WineRunTask: Preserve the old WineTest report in case of timeout.

If the task timed out the new report is likely quite incomplete and thus
would be a poor substitute for the existing reference WineTest report.

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

---

 testbot/bin/WineRunTask.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index ed19034..7f92b88 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -289,7 +289,7 @@ sub WrapUpAndExit($;$$$)
     $VM->Save();
   }
 
-  if ($Status eq 'completed' and $Step->Type eq 'suite')
+  if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut)
   {
     # Keep the old report if the new one is missing
     if (-f "$TaskDir/log" and !-z "$TaskDir/log")