[rtems-tools commit] covoar: Fix build path checks for multiple executables.
Joel Sherrill
joel at rtems.org
Mon May 14 20:06:29 UTC 2018
Module: rtems-tools
Branch: master
Commit: 70dac81c29b645f0dd0827f20a2ecf4b8bf9de6c
Changeset: http://git.rtems.org/rtems-tools/commit/?id=70dac81c29b645f0dd0827f20a2ecf4b8bf9de6c
Author: Cillian O'Donnell <cpodonnell8 at gmail.com>
Date: Mon May 14 20:26:21 2018 +0100
covoar: Fix build path checks for multiple executables.
---
tester/covoar/covoar.cc | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/tester/covoar/covoar.cc b/tester/covoar/covoar.cc
index 5c87402..c6b0589 100644
--- a/tester/covoar/covoar.cc
+++ b/tester/covoar/covoar.cc
@@ -75,7 +75,7 @@ static void createBuildPath(Executables& executablesToAnalyze,
if (buildPrefix.empty()) {
buildPrefix = *pri;
} else {
- if (buildBSP != *pri) {
+ if (buildPrefix != *pri) {
fail = "executable build prefix does not match: " + buildPrefix;
break;
}
@@ -97,7 +97,7 @@ static void createBuildPath(Executables& executablesToAnalyze,
if (buildPath.empty()) {
buildPath = thisBuildPath;
} else {
- if (buildBSP != *pri) {
+ if (buildPath != thisBuildPath) {
fail = "executable build path does not match: " + buildPath;
}
}
@@ -316,11 +316,7 @@ int main(
std::cerr << "warning: Unable to read executable: " << argv[i] << std::endl;
} else {
coverageFileName = argv[i];
- coverageFileName.replace(
- coverageFileName.length() - executableExtension.size(),
- executableExtension.size(),
- coverageExtension
- );
+ coverageFileName.append( "." + coverageExtension );
if (!FileIsReadable( coverageFileName.c_str() )) {
std::cerr << "warning: Unable to read coverage file: " << coverageFileName
More information about the vc
mailing list