summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestCoverageHandler.cxx15
-rw-r--r--Source/CTest/cmCTestCoverageHandler.h4
2 files changed, 13 insertions, 6 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 1faf05a..fa9a220 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -1749,9 +1749,9 @@ void cmCTestCoverageHandler::LoadLabels()
{
std::string fileList = this->CTest->GetBinaryDir();
fileList += cmake::GetCMakeFilesDirectory();
- fileList += "/LabelFiles.txt";
+ fileList += "/TargetDirectories.txt";
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- " label file list [" << fileList << "]\n");
+ " target directory list [" << fileList << "]\n");
std::ifstream finList(fileList.c_str());
std::string line;
while(cmSystemTools::GetLineFromStream(finList, line))
@@ -1761,11 +1761,18 @@ void cmCTestCoverageHandler::LoadLabels()
}
//----------------------------------------------------------------------
-void cmCTestCoverageHandler::LoadLabels(const char* fname)
+void cmCTestCoverageHandler::LoadLabels(const char* dir)
{
+ std::string fname = dir;
+ fname += "/Labels.txt";
+ std::ifstream fin(fname.c_str());
+ if(!fin)
+ {
+ return;
+ }
+
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
" loading labels from [" << fname << "]\n");
- std::ifstream fin(fname);
bool inTarget = true;
std::string source;
std::string line;
diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index 48894fb..46bcec1 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -152,9 +152,9 @@ private:
std::vector<std::string> Labels;
int GetLabelId(std::string const& label);
- // Load reading and writing methods.
+ // Label reading and writing methods.
void LoadLabels();
- void LoadLabels(const char* fname);
+ void LoadLabels(const char* dir);
void WriteXMLLabels(std::ofstream& os, std::string const& source);
// Label-based filtering.