Francois Gouget : testbot/WineRunTask: Keep the old reference report if the new one is missing.

[Alexandre Julliard]

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

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

testbot/WineRunTask: Keep the old reference report if the new one is missing.

The WineTest results usually don't change too much from one run to the
next so it's better to have a slightly out of date report than nothing
at all.

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

---

 testbot/bin/WineRunTask.pl | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index c4ca578..ed19034 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -291,13 +291,20 @@ sub WrapUpAndExit($;$$$)
 
   if ($Status eq 'completed' and $Step->Type eq 'suite')
   {
-    # Update the reference VM suite results for WineSendLog.pl
-    my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_",
-                              $Step->FileType eq "exe64" ? "64" : "32");
-    unlink("$LatestBaseName.log");
-    link("$TaskDir/log", "$LatestBaseName.log") if (-f "$TaskDir/log");
-    unlink("$LatestBaseName.err");
-    link("$TaskDir/err", "$LatestBaseName.err") if (-f "$TaskDir/err");
+    # Keep the old report if the new one is missing
+    if (-f "$TaskDir/log" and !-z "$TaskDir/log")
+    {
+      # Update the reference VM suite results for WineSendLog.pl
+      my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_",
+                                $Step->FileType eq "exe64" ? "64" : "32");
+      unlink("$LatestBaseName.log");
+      link("$TaskDir/log", "$LatestBaseName.log");
+      unlink("$LatestBaseName.err");
+      if (-f "$TaskDir/err" and !-z "$TaskDir/err")
+      {
+        link("$TaskDir/err", "$LatestBaseName.err");
+      }
+    }
   }
 
   my $Result = $VM->Name .": ". $VM->Status ." Status: $Status Failures: ". (defined $TestFailures ? $TestFailures : "unset");