diff options
author | Cillian O'Donnell <cpodonnell8@gmail.com> | 2018-05-14 20:26:21 +0100 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2018-05-14 15:06:19 -0500 |
commit | 70dac81c29b645f0dd0827f20a2ecf4b8bf9de6c (patch) | |
tree | 459f9121235d1a1245e1618df7e51bd11eb61d09 | |
parent | b0b936680730a19ac79a2b3651d188052952dbbc (diff) |
covoar: Fix build path checks for multiple executables.
-rw-r--r-- | tester/covoar/covoar.cc | 10 |
1 files 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 |