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

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Wed Apr 24 18:37:39 2013 +0200

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

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 0b31e7c..8ea4d9c 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);
         }