summaryrefslogtreecommitdiff
path: root/Source/CTest/cmCTestConfigureHandler.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-03-09 11:17:10 -0500
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-03-09 11:17:10 -0500
commit6503a0eecce984c3c5ede6f0d1f4951a14f9cc3f (patch)
treea47c2d44773e08cd539959332fbb7fe688b35090 /Source/CTest/cmCTestConfigureHandler.cxx
parent10d1b2079072150321ee29b249fc39f116671375 (diff)
downloadcmake-6503a0eecce984c3c5ede6f0d1f4951a14f9cc3f.tar.gz
STYLE: Fix some style issues
Diffstat (limited to 'Source/CTest/cmCTestConfigureHandler.cxx')
-rw-r--r--Source/CTest/cmCTestConfigureHandler.cxx44
1 files changed, 27 insertions, 17 deletions
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx
index 07d41906ba..3152fffd0a 100644
--- a/Source/CTest/cmCTestConfigureHandler.cxx
+++ b/Source/CTest/cmCTestConfigureHandler.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.
=========================================================================*/
@@ -43,15 +43,19 @@ int cmCTestConfigureHandler::ProcessHandler()
std::string cCommand = m_CTest->GetCTestConfiguration("ConfigureCommand");
if ( cCommand.size() == 0 )
{
- cmCTestLog(m_CTest, ERROR_MESSAGE, "Cannot find ConfigureCommand key in the DartConfiguration.tcl"
- << std::endl);
+ cmCTestLog(m_CTest, ERROR_MESSAGE,
+ "Cannot find ConfigureCommand key in the DartConfiguration.tcl"
+ << std::endl);
return -1;
}
- std::string buildDirectory = m_CTest->GetCTestConfiguration("BuildDirectory");
+ std::string buildDirectory
+ = m_CTest->GetCTestConfiguration("BuildDirectory");
if ( buildDirectory.size() == 0 )
{
- cmCTestLog(m_CTest, ERROR_MESSAGE, "Cannot find BuildDirectory key in the DartConfiguration.tcl" << std::endl);
+ cmCTestLog(m_CTest, ERROR_MESSAGE,
+ "Cannot find BuildDirectory key in the DartConfiguration.tcl"
+ << std::endl);
return -1;
}
@@ -61,18 +65,20 @@ int cmCTestConfigureHandler::ProcessHandler()
int res = 0;
if ( !m_CTest->GetShowOnly() )
{
- cmGeneratedFileStream os;
+ cmGeneratedFileStream os;
if ( !this->StartResultingXML("Configure", os) )
{
- cmCTestLog(m_CTest, ERROR_MESSAGE, "Cannot open configure file" << std::endl);
+ cmCTestLog(m_CTest, ERROR_MESSAGE, "Cannot open configure file"
+ << std::endl);
return 1;
}
std::string start_time = m_CTest->CurrentTime();
cmGeneratedFileStream ofs;
this->StartLogFile("Configure", ofs);
- cmCTestLog(m_CTest, HANDLER_VERBOSE_OUTPUT, "Configure with command: " << cCommand.c_str() << std::endl);
- res = m_CTest->RunMakeCommand(cCommand.c_str(), &output,
+ cmCTestLog(m_CTest, HANDLER_VERBOSE_OUTPUT, "Configure with command: "
+ << cCommand.c_str() << std::endl);
+ res = m_CTest->RunMakeCommand(cCommand.c_str(), &output,
&retVal, buildDirectory.c_str(),
0, ofs);
@@ -80,37 +86,41 @@ int cmCTestConfigureHandler::ProcessHandler()
{
ofs.close();
}
-
+
if ( os )
{
m_CTest->StartXML(os);
os << "<Configure>\n"
- << "\t<StartDateTime>" << start_time << "</StartDateTime>" << std::endl;
+ << "\t<StartDateTime>" << start_time << "</StartDateTime>"
+ << std::endl;
if ( res == cmsysProcess_State_Exited && retVal )
{
os << retVal;
}
- os << "<ConfigureCommand>" << cCommand.c_str() << "</ConfigureCommand>" << std::endl;
+ os << "<ConfigureCommand>" << cCommand.c_str() << "</ConfigureCommand>"
+ << std::endl;
cmCTestLog(m_CTest, DEBUG, "End" << std::endl);
os << "<Log>" << cmCTest::MakeXMLSafe(output) << "</Log>" << std::endl;
std::string end_time = m_CTest->CurrentTime();
os << "\t<ConfigureStatus>" << retVal << "</ConfigureStatus>\n"
<< "\t<EndDateTime>" << end_time << "</EndDateTime>\n"
- << "<ElapsedMinutes>"
+ << "<ElapsedMinutes>"
<< static_cast<int>(
(cmSystemTools::GetTime() - elapsed_time_start)/6)/10.0
<< "</ElapsedMinutes>"
<< "</Configure>" << std::endl;
m_CTest->EndXML(os);
- }
+ }
}
else
{
- cmCTestLog(m_CTest, DEBUG, "Configure with command: " << cCommand << std::endl);
+ cmCTestLog(m_CTest, DEBUG, "Configure with command: " << cCommand
+ << std::endl);
}
if (! res || retVal )
{
- cmCTestLog(m_CTest, ERROR_MESSAGE, "Error(s) when updating the project" << std::endl);
+ cmCTestLog(m_CTest, ERROR_MESSAGE, "Error(s) when updating the project"
+ << std::endl);
return -1;
}
return 0;