浏览代码

BUG: Fix coverage handler initialization

This resets coverage handler internal state on initialization so that
multiple coverage runs are independent.
Brad King 16 年之前
父节点
当前提交
c4596605df
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      Source/CTest/cmCTestCoverageHandler.cxx

+ 5 - 2
Source/CTest/cmCTestCoverageHandler.cxx

@@ -152,7 +152,10 @@ cmCTestCoverageHandler::cmCTestCoverageHandler()
 void cmCTestCoverageHandler::Initialize()
 void cmCTestCoverageHandler::Initialize()
 {
 {
   this->Superclass::Initialize();
   this->Superclass::Initialize();
-  this->CustomCoverageExclude.empty();
+  this->CustomCoverageExclude.clear();
+  this->SourceLabels.clear();
+  this->LabelIdMap.clear();
+  this->Labels.clear();
 }
 }
 
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
@@ -346,7 +349,7 @@ int cmCTestCoverageHandler::ProcessHandler()
   cont.OFS = &ofs;
   cont.OFS = &ofs;
 
 
   // setup the regex exclude stuff
   // setup the regex exclude stuff
-  this->CustomCoverageExcludeRegex.empty();
+  this->CustomCoverageExcludeRegex.clear();
   std::vector<cmStdString>::iterator rexIt;
   std::vector<cmStdString>::iterator rexIt;
   for ( rexIt = this->CustomCoverageExclude.begin();
   for ( rexIt = this->CustomCoverageExclude.begin();
     rexIt != this->CustomCoverageExclude.end();
     rexIt != this->CustomCoverageExclude.end();