testbot/WineRunTask: Only link test suite results from the 'latest' directory.

Francois Gouget fgouget at codeweavers.com
Wed Apr 24 11:37:39 CDT 2013


These results are later used to filter out test failures that are already present in the Wine source from those introduced by the new patches being tested.
Linking every test result there would result in test failures to be sometimes wrongfully ignored.
---
 testbot/bin/WineRunTask.pl |    8 +++-----
 testbot/bin/WineSendLog.pl |    3 +++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 4428b6b..a06c8e6 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -68,6 +68,7 @@ sub FatalError($$$$$)
   LogTaskError($ErrMessage, $FullErrFileName);
   if ($Step->Type eq "suite")
   {
+    # Link the test suite's results for future use in WineSendLog.pl.
     my $LatestName = "$DataDir/latest/" . $Task->VM->Name . "_" .
                      ($Step->FileType eq "exe64" ? "64" : "32") . ".err";
     unlink($LatestName);
@@ -337,13 +338,10 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
   $Task->TestFailures($TestFailures);
   $NewStatus = "completed";
 
+  chmod 0664, $FullLogFileName;
   if ($Step->Type eq "suite")
   {
-    chmod 0664, $FullLogFileName;
-  }
-  else
-  {
-    chmod 0664, $FullLogFileName;
+    # Link the test suite's results for future use in WineSendLog.pl.
     my $LatestNameBase = "$DataDir/latest/" . $VM->Name . "_" .
                          ($Step->FileType eq "exe64" ? "64" : "32");
     unlink("${LatestNameBase}.log");
diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 0318399..d2f2daf 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -401,6 +401,9 @@ EOF
       {
         if (defined($StepTask->CmdLineArg))
         {
+          # Filter out failures that happened in the full test suite:
+          # the test suite is run against code which is already in Wine
+          # so all any failure it reported not caused by this patch.
           $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log",
                                          $BaseName, $StepTask->CmdLineArg);
         }
-- 
1.7.10.4




More information about the wine-patches mailing list