Francois Gouget : testbot/WineRun{Task,WineTest}: Fix parsing error reporting.

Alexandre Julliard julliard at winehq.org
Tue Jan 14 15:54:13 CST 2020


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Tue Jan 14 12:22:51 2020 +0100

testbot/WineRun{Task,WineTest}: Fix parsing error reporting.

Use the error message returned by ParseWineTestReport() when it could
not open the report instead of recreating it from scratch.

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

---

 testbot/bin/WineRunTask.pl     | 4 ++--
 testbot/bin/WineRunWineTest.pl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 6a30de3..cef7a5c 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -562,8 +562,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName"))
   {
     # Could not open the file
     $NewStatus = 'boterror';
-    Error "Unable to open '$RptFileName' for reading: $!\n";
-    LogTaskError("Unable to open '$RptFileName' for reading: $!\n");
+    Error "$LogErrors->[0]\n";
+    LogTaskError("$LogErrors->[0]\n");
   }
   else
   {
diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl
index a2297cb..1cf9541 100755
--- a/testbot/bin/WineRunWineTest.pl
+++ b/testbot/bin/WineRunWineTest.pl
@@ -584,8 +584,8 @@ foreach my $Mission (@{$TaskMissions->{Missions}})
     {
       # Could not open the file
       $NewStatus = 'boterror';
-      Error "Unable to open '$RptFileName' for reading: $!\n";
-      LogTaskError("Unable to open '$RptFileName' for reading: $!\n");
+      Error "$LogErrors->[0]\n";
+      LogTaskError("$LogErrors->[0]\n");
     }
     else
     {




More information about the wine-cvs mailing list