[Cmake-commits] CMake branch, next, updated. v3.1.0-1813-gdb293e1

[Bill Hoffman]

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  db293e1ca64acb9302b6ca660e94aee305045055 (commit)
       via  c7e52683d35883c9f7f46574bf357d0c7ed3bb7f (commit)
      from  3f421206324fc57cfda97ef50e57e0c8c3ce1a40 (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=db293e1ca64acb9302b6ca660e94aee305045055
commit db293e1ca64acb9302b6ca660e94aee305045055
Merge: 3f42120 c7e5268
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Mon Jan 12 17:34:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 17:34:36 2015 -0500

    Merge topic 'cdash_upload_file_mode' into next
    
    c7e52683 Handle the case when there is no upload file or type.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7e52683d35883c9f7f46574bf357d0c7ed3bb7f
commit c7e52683d35883c9f7f46574bf357d0c7ed3bb7f
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Mon Jan 12 17:33:58 2015 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Mon Jan 12 17:33:58 2015 -0500

    Handle the case when there is no upload file or type.

diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 71491d8..2f6a9e9 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1209,11 +1209,12 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
 //----------------------------------------------------------------------------
 int cmCTestSubmitHandler::ProcessHandler()
 {
-  std::string cdashUploadFile = this->GetOption("CDashUploadFile");
-  std::string cdashUploadType = this->GetOption("CDashUploadType");
-  if(cdashUploadFile.size())
+  const char* cdashUploadFile = this->GetOption("CDashUploadFile");
+  const char* cdashUploadType = this->GetOption("CDashUploadType");
+  if(cdashUploadFile && cdashUploadType)
     {
-    return this->HandleCDashUploadFile(cdashUploadFile, cdashUploadType);
+    return this->HandleCDashUploadFile(std::string(cdashUploadFile),
+                                       std::string(cdashUploadType));
     }
   std::string iscdash = this->CTest->GetCTestConfiguration("IsCDash");
   // cdash does not need to trigger so just return true

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

Summary of changes:
 Source/CTest/cmCTestSubmitHandler.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake