kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Reorganize a bit and make sure to report an error if there are modified files or conflicts

This commit is contained in:
Andy Cedilnik 2005-04-21 18:23:28 -04:00
parent 2f4e516e23
commit dadd974d97
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/CTest/cmCTestUpdateHandler.cxx
View File

@ -204,6 +204,7 @@ int cmCTestUpdateHandler::ProcessHandler()
int count = 0; int count = 0;
int updateType = e_CVS; int updateType = e_CVS;
std::string::size_type cc, kk; std::string::size_type cc, kk;
bool updateProducedError = false;
// Get source dir // Get source dir
@ -390,6 +391,10 @@ int cmCTestUpdateHandler::ProcessHandler()
ofs << goutput << std::endl;; ofs << goutput << std::endl;;
} }
} }
if ( !res || retVal )
{
updateProducedError = true;
}
os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
<< "<Update mode=\"Client\" Generator=\"ctest-" << "<Update mode=\"Client\" Generator=\"ctest-"
@ -401,15 +406,7 @@ int cmCTestUpdateHandler::ProcessHandler()
<< m_CTest->GetTestModelString() << "</BuildStamp>" << std::endl; << m_CTest->GetTestModelString() << "</BuildStamp>" << std::endl;
os << "\t<StartDateTime>" << start_time << "</StartDateTime>\n" os << "\t<StartDateTime>" << start_time << "</StartDateTime>\n"
<< "\t<UpdateCommand>" << m_CTest->MakeXMLSafe(command) << "\t<UpdateCommand>" << m_CTest->MakeXMLSafe(command)
<< "</UpdateCommand>\n" << "</UpdateCommand>\n";
<< "\t<UpdateReturnStatus>";
if ( !res || retVal )
{
os << "Update error: ";
os << m_CTest->MakeXMLSafe(goutput);
std::cerr << "Update with command: " << command << " failed" << std::endl;
}
os << "</UpdateReturnStatus>" << std::endl;
// Even though it failed, we may have some useful information. Try to continue... // Even though it failed, we may have some useful information. Try to continue...
std::vector<cmStdString> lines; std::vector<cmStdString> lines;
@ -806,8 +803,21 @@ int cmCTestUpdateHandler::ProcessHandler()
os << "\t<EndDateTime>" << end_time << "</EndDateTime>\n" os << "\t<EndDateTime>" << end_time << "</EndDateTime>\n"
<< "<ElapsedMinutes>" << << "<ElapsedMinutes>" <<
static_cast<int>((cmSystemTools::GetTime() - elapsed_time_start)/6)/10.0 static_cast<int>((cmSystemTools::GetTime() - elapsed_time_start)/6)/10.0
<< "</ElapsedMinutes>" << "</ElapsedMinutes>\n"
<< "</Update>" << std::endl; << "\t<UpdateReturnStatus>";
if ( num_modified > 0 || num_conflicting > 0 )
{
os << "Update error: There are modified or conflicting files in the repository";
std::cerr << " There are modified or conflicting files in the repository" << std::endl;
}
if ( !res || retVal )
{
os << "Update error: ";
os << m_CTest->MakeXMLSafe(goutput);
std::cerr << " Update with command: " << command << " failed" << std::endl;
}
os << "</UpdateReturnStatus>" << std::endl;
os << "</Update>" << std::endl;
if ( ofs ) if ( ofs )
{ {