Francois Gouget : testbot/WineRunReconfig: Don' t update the TestList if the Reconfig failed.

Alexandre Julliard julliard at winehq.org
Thu May 18 14:27:28 CDT 2017


Module: tools
Branch: master
Commit: 049ee751f8e742f2488de2b1a2bed438d47500c9
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=049ee751f8e742f2488de2b1a2bed438d47500c9

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu May 18 06:58:29 2017 +0200

testbot/WineRunReconfig: Don't update the TestList if the Reconfig failed.

If we failed to update/rebuild Wine then we will stick with the old Wine
and we should still use the old test list.

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

---

 testbot/bin/WineRunReconfig.pl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 1337320..c99c1ab 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -373,15 +373,18 @@ elsif (!defined $TAError)
   $TAError = "An error occurred while retrieving the reconfig log: ". $TA->GetLastError();
 }
 
-Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n");
-if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt"))
+if ($NewStatus eq "completed")
 {
   use File::Copy;
-  copy "$TaskDir/testlist.txt", "$DataDir/latest/testlist.txt";
-}
-elsif (!defined $TAError)
-{
-  $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError();
+  Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n");
+  if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt"))
+  {
+    copy "$TaskDir/testlist.txt", "$DataDir/latest/testlist.txt";
+  }
+  elsif (!defined $TAError)
+  {
+    $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError();
+  }
 }
 
 $TA->Disconnect();




More information about the wine-cvs mailing list