diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-10-12 15:06:49 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-10-12 15:06:49 (GMT) |
| commit | a5aa23d4e1e6e4cc7898d83fdd0c4d2d01e433f6 (patch) | |
| tree | 1b25fe212e5df043b3f0288dd4e1477f3271ef1c | |
| parent | 300dcd45a0f2a6cc5bb72fa5059c071f828667a0 (diff) | |
| download | CMake-a5aa23d4e1e6e4cc7898d83fdd0c4d2d01e433f6.zip CMake-a5aa23d4e1e6e4cc7898d83fdd0c4d2d01e433f6.tar.gz CMake-a5aa23d4e1e6e4cc7898d83fdd0c4d2d01e433f6.tar.bz2 | |
CTest-side support for compiler name and compiler version information. Requires CDash update to show on CDash.
| -rw-r--r-- | Modules/DartConfiguration.tcl.in | 5 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index 7b79a3d..2eea45c 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/Modules/DartConfiguration.tcl.in @@ -45,7 +45,10 @@ UpdateCommand: @UPDATE_COMMAND@ UpdateOptions: @UPDATE_OPTIONS@ UpdateType: @UPDATE_TYPE@ -# Dynamic analisys and coverage +# Compiler info +Compiler: @CMAKE_CXX_COMPILER@ + +# Dynamic analysis and coverage PurifyCommand: @PURIFYCOMMAND@ ValgrindCommand: @VALGRIND_COMMAND@ ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@ diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index fa6333f..c359e9c 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -454,10 +454,10 @@ int cmCTest::Initialize(const char* binary_dir, bool new_tag, //---------------------------------------------------------------------- bool cmCTest::InitializeFromCommand(cmCTestCommand* command, bool first) { - if ( !first && !this->CurrentTag.empty() ) - { - return true; - } + //if ( !first && !this->CurrentTag.empty() ) + // { + // return true; + // } std::string src_dir = this->GetCTestConfiguration("SourceDirectory").c_str(); @@ -564,6 +564,7 @@ bool cmCTest::UpdateCTestConfiguration() << fileName.c_str() << "\n"); // parse the dart test file std::ifstream fin(fileName.c_str()); + if(!fin) { return false; @@ -1265,6 +1266,10 @@ void cmCTest::StartXML(std::ostream& ostr, bool append) << this->GetCTestConfiguration("Site") << "\"\n\tGenerator=\"ctest-" << cmVersion::GetCMakeVersion() << "\"\n" << (append? "\tAppend=\"true\"\n":"") + << "\tCompilerName=\"" << this->GetCTestConfiguration("Compiler") << "\"\n" +#ifdef _COMPILER_VERSION + << "\tCompilerVersion=\"_COMPILER_VERSION\"\n" +#endif << "\tOSName=\"" << info.GetOSName() << "\"\n" << "\tHostname=\"" << info.GetHostname() << "\"\n" << "\tOSRelease=\"" << info.GetOSRelease() << "\"\n" |