diff options
Diffstat (limited to 'Source/CTest/cmCTestSubmitCommand.cxx')
| -rw-r--r-- | Source/CTest/cmCTestSubmitCommand.cxx | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index 3026e92..bfa0edb 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -9,8 +9,8 @@ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ @@ -36,24 +36,30 @@ bool cmCTestSubmitCommand::InitialPass( { if ( res_var ) { - this->SetError("called with incorrect number of arguments. RETURN_VALUE specified twice."); + this->SetError("called with incorrect number of arguments. " + "RETURN_VALUE specified twice."); return false; } havereturn_variable = true; - } + } else { cmOStringStream str; - str << "called with incorrect number of arguments. Extra argument is: " << args[i].c_str() << "."; + str << "called with incorrect number of arguments. Extra argument is: " + << args[i].c_str() << "."; this->SetError(str.str().c_str()); return false; } } - const char* ctestDropMethod = m_Makefile->GetDefinition("CTEST_DROP_METHOD"); - const char* ctestDropSite = m_Makefile->GetDefinition("CTEST_DROP_SITE"); - const char* ctestDropLocation = m_Makefile->GetDefinition("CTEST_DROP_LOCATION"); - const char* ctestTriggerSite = m_Makefile->GetDefinition("CTEST_TRIGGER_SITE"); + const char* ctestDropMethod + = m_Makefile->GetDefinition("CTEST_DROP_METHOD"); + const char* ctestDropSite + = m_Makefile->GetDefinition("CTEST_DROP_SITE"); + const char* ctestDropLocation + = m_Makefile->GetDefinition("CTEST_DROP_LOCATION"); + const char* ctestTriggerSite + = m_Makefile->GetDefinition("CTEST_TRIGGER_SITE"); if ( !ctestDropMethod ) { @@ -69,8 +75,10 @@ bool cmCTestSubmitCommand::InitialPass( } if ( !ctestTriggerSite ) { - ctestTriggerSite = "http://public.kitware.com/cgi-bin/Submit-Random-TestingResults.cgi"; - cmCTestLog(m_CTest, HANDLER_OUTPUT, "* Use default trigger site: " << ctestTriggerSite << std::endl;); + ctestTriggerSite + = "http://public.kitware.com/cgi-bin/Submit-Random-TestingResults.cgi"; + cmCTestLog(m_CTest, HANDLER_OUTPUT, "* Use default trigger site: " + << ctestTriggerSite << std::endl;); } m_CTest->SetCTestConfiguration("DropMethod", ctestDropMethod); @@ -78,18 +86,22 @@ bool cmCTestSubmitCommand::InitialPass( m_CTest->SetCTestConfiguration("DropLocation", ctestDropLocation); m_CTest->SetCTestConfiguration("TriggerSite", ctestTriggerSite); - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "DropSiteUser", "CTEST_DROP_SITE_USER"); - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "DropSitePassword", "CTEST_DROP_SITE_PASSWORD"); - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "ScpCommand", "CTEST_SCP_COMMAND"); + m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, + "DropSiteUser", "CTEST_DROP_SITE_USER"); + m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, + "DropSitePassword", "CTEST_DROP_SITE_PASSWORD"); + m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, + "ScpCommand", "CTEST_SCP_COMMAND"); - const char* notesFilesVariable = m_Makefile->GetDefinition("CTEST_NOTES_FILES"); + const char* notesFilesVariable + = m_Makefile->GetDefinition("CTEST_NOTES_FILES"); if (notesFilesVariable) { std::vector<std::string> notesFiles; std::vector<cmStdString> newNotesFiles; cmSystemTools::ExpandListArgument(notesFilesVariable,notesFiles); std::vector<std::string>::iterator it; - for ( it = notesFiles.begin(); + for ( it = notesFiles.begin(); it != notesFiles.end(); ++ it ) { @@ -97,14 +109,15 @@ bool cmCTestSubmitCommand::InitialPass( } m_CTest->GenerateNotesFile(newNotesFiles); } - const char* extraFilesVariable = m_Makefile->GetDefinition("CTEST_EXTRA_SUBMIT_FILES"); + const char* extraFilesVariable + = m_Makefile->GetDefinition("CTEST_EXTRA_SUBMIT_FILES"); if (extraFilesVariable) { std::vector<std::string> extraFiles; std::vector<cmStdString> newExtraFiles; cmSystemTools::ExpandListArgument(extraFilesVariable,extraFiles); std::vector<std::string>::iterator it; - for ( it = extraFiles.begin(); + for ( it = extraFiles.begin(); it != extraFiles.end(); ++ it ) { |