[PATCH] covoar.cc: Correct build path checks for multiple executables.

Joel Sherrill joel at rtems.org
Mon May 14 15:46:29 UTC 2018


I'll commit this once there is a log message. :)

On Sun, May 13, 2018 at 3:45 PM, Cillian O'Donnell <cpodonnell8 at gmail.com>
wrote:

> ---
>  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
> --
> 2.7.4
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20180514/16ff2ef6/attachment-0002.html>


More information about the devel mailing list