[Cmake-commits] CMake branch, next, updated. v2.8.1-1315-g417d98f

[Zach Mullen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  417d98fba6bc5741826ba99342edfd1c7940447a (commit)
       via  86e81b53c196bfd29aa7d877d2fb9e71a6392cc1 (commit)
      from  4a94687fa4435dd468cae62bbdc9f755aee49362 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=417d98fba6bc5741826ba99342edfd1c7940447a
commit 417d98fba6bc5741826ba99342edfd1c7940447a
Merge: 4a94687 86e81b5
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Sat Jun 5 10:36:43 2010 -0400

    Merge branch 'ctest-file-checksum' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86e81b53c196bfd29aa7d877d2fb9e71a6392cc1
commit 86e81b53c196bfd29aa7d877d2fb9e71a6392cc1
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Sat Jun 5 10:36:23 2010 -0400

    CTest should resubmit in the checksum failed case

diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 9bbb2e6..21c005d 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -501,8 +501,22 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const cmStdString& localprefix,
       // Now run off and do what you've been told!
       res = ::curl_easy_perform(curl);
 
-      // If we time out or operation is too slow, wait and retry
-      if(res == CURLE_OPERATION_TIMEOUTED)
+      if ( chunk.size() > 0 )
+        {
+        cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+          << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
+          << std::endl);
+        this->ParseResponse(chunk);
+        }
+      if ( chunkDebug.size() > 0 )
+        {
+        cmCTestLog(this->CTest, DEBUG, "CURL debug output: ["
+          << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]"
+          << std::endl);
+        }
+
+      // If we time out or checksum fails, wait and retry
+      if(res == CURLE_OPERATION_TIMEDOUT || this->HasErrors)
         {
         std::string retryTime = this->GetOption("RetryTime") == NULL ?
           "" : this->GetOption("RetryTime");
@@ -532,30 +546,25 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const cmStdString& localprefix,
 
           chunk.clear();
           chunkDebug.clear();
+          this->HasErrors = false;
 
           res = ::curl_easy_perform(curl);
 
-          if(res != CURLE_OPERATION_TIMEDOUT)
+          if ( chunk.size() > 0 )
+            {
+            cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+              << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
+              << std::endl);
+            this->ParseResponse(chunk);
+            }
+
+          if(res != CURLE_OPERATION_TIMEDOUT && !this->HasErrors)
             {
             break;
             }
           }
         }
 
-      if ( chunk.size() > 0 )
-        {
-        cmCTestLog(this->CTest, DEBUG, "CURL output: ["
-          << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-          << std::endl);
-        this->ParseResponse(chunk);
-        }
-      if ( chunkDebug.size() > 0 )
-        {
-        cmCTestLog(this->CTest, DEBUG, "CURL debug output: ["
-          << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]"
-          << std::endl);
-        }
-
       fclose(ftpfile);
       if ( res )
         {

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestSubmitHandler.cxx |   43 ++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake