summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-03-11 17:31:33 (GMT)
committerBrad King <brad.king@kitware.com>2009-03-11 17:31:33 (GMT)
commit5bc17136a36f837970d2d6fa83ce0bf84157b321 (patch)
tree6e7546fa4ba2b2b808cb0b38b197f02c12615a5d
parentf3e713ba653c1b435c6308474d07eeaffcc9620f (diff)
downloadCMake-5bc17136a36f837970d2d6fa83ce0bf84157b321.zip
CMake-5bc17136a36f837970d2d6fa83ce0bf84157b321.tar.gz
CMake-5bc17136a36f837970d2d6fa83ce0bf84157b321.tar.bz2
BUG: Do not carry over file list between coverage
When performing multiple ctest_coverage() commands in a single CTest instance we need to clear the list of CoverageLog-*.xml files for submission. Otherwise if the current coverage run produces fewer log files than the previous run CTest will attempt to submit non-existing files.
-rw-r--r--Source/CTest/cmCTestCoverageHandler.cxx1
-rw-r--r--Source/cmCTest.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index fe4e2bf..59c91ec 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -334,6 +334,7 @@ bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file,
//functions and commented...
int cmCTestCoverageHandler::ProcessHandler()
{
+ this->CTest->ClearSubmitFiles(cmCTest::PartCoverage);
int error = 0;
// do we have time for this
if (this->CTest->GetRemainingTimeAllowed() < 120)
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 5e1612e..5eca3c3 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -358,6 +358,7 @@ public:
void AddSubmitFile(Part part, const char* name);
std::vector<std::string> const& GetSubmitFiles(Part part)
{ return this->Parts[part].SubmitFiles; }
+ void ClearSubmitFiles(Part part) { this->Parts[part].SubmitFiles.clear(); }
//! Read the custom configuration files and apply them to the current ctest
int ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf);