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

CTest-side support for compiler name and compiler version information. Requires CDash update to show on CDash.

Browse Source
This commit is contained in:
Zach Mullen 2009-10-12 11:06:49 -04:00
parent 300dcd45a0
commit a5aa23d4e1
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/DartConfiguration.tcl.in
View File

@ -45,7 +45,10 @@ UpdateCommand: @UPDATE_COMMAND@
UpdateOptions: @UPDATE_OPTIONS@ UpdateOptions: @UPDATE_OPTIONS@
UpdateType: @UPDATE_TYPE@ UpdateType: @UPDATE_TYPE@
# Dynamic analisys and coverage # Compiler info
Compiler: @CMAKE_CXX_COMPILER@
# Dynamic analysis and coverage
PurifyCommand: @PURIFYCOMMAND@ PurifyCommand: @PURIFYCOMMAND@
ValgrindCommand: @VALGRIND_COMMAND@ ValgrindCommand: @VALGRIND_COMMAND@
ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@ ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@

13
Source/cmCTest.cxx
View File

@ -454,10 +454,10 @@ int cmCTest::Initialize(const char* binary_dir, bool new_tag,
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool cmCTest::InitializeFromCommand(cmCTestCommand* command, bool first) bool cmCTest::InitializeFromCommand(cmCTestCommand* command, bool first)
{ {
if ( !first && !this->CurrentTag.empty() ) //if ( !first && !this->CurrentTag.empty() )
{ // {
return true; // return true;
} // }
std::string src_dir std::string src_dir
= this->GetCTestConfiguration("SourceDirectory").c_str(); = this->GetCTestConfiguration("SourceDirectory").c_str();
@ -564,6 +564,7 @@ bool cmCTest::UpdateCTestConfiguration()
<< fileName.c_str() << "\n"); << fileName.c_str() << "\n");
// parse the dart test file // parse the dart test file
std::ifstream fin(fileName.c_str()); std::ifstream fin(fileName.c_str());
if(!fin) if(!fin)
{ {
return false; return false;
@ -1265,6 +1266,10 @@ void cmCTest::StartXML(std::ostream& ostr, bool append)
<< this->GetCTestConfiguration("Site") << "\"\n\tGenerator=\"ctest-" << this->GetCTestConfiguration("Site") << "\"\n\tGenerator=\"ctest-"
<< cmVersion::GetCMakeVersion() << "\"\n" << cmVersion::GetCMakeVersion() << "\"\n"
<< (append? "\tAppend=\"true\"\n":"") << (append? "\tAppend=\"true\"\n":"")
<< "\tCompilerName=\"" << this->GetCTestConfiguration("Compiler") << "\"\n"
#ifdef _COMPILER_VERSION
<< "\tCompilerVersion=\"_COMPILER_VERSION\"\n"
#endif
<< "\tOSName=\"" << info.GetOSName() << "\"\n" << "\tOSName=\"" << info.GetOSName() << "\"\n"
<< "\tHostname=\"" << info.GetHostname() << "\"\n" << "\tHostname=\"" << info.GetHostname() << "\"\n"
<< "\tOSRelease=\"" << info.GetOSRelease() << "\"\n" << "\tOSRelease=\"" << info.GetOSRelease() << "\"\n"