From edf81febebe9d2ac80b51e30cfb2195068aeaa3e Mon Sep 17 00:00:00 2001 From: Jim Kuhn Date: Tue, 20 Sep 2022 16:25:39 -0400 Subject: [PATCH 1/2] Fix sense of test (.analyzerinfo files get placed in wrong directory) --- lib/analyzerinfo.cpp | 2 +- test/testanalyzerinformation.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp index 1cd3a46529e..0140aeb37b1 100644 --- a/lib/analyzerinfo.cpp +++ b/lib/analyzerinfo.cpp @@ -120,7 +120,7 @@ std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir const std::string::size_type pos = sourcefile.rfind('/'); std::string filename; - if (pos != std::string::npos) + if (pos == std::string::npos) filename = sourcefile; else filename = sourcefile.substr(pos + 1); diff --git a/test/testanalyzerinformation.cpp b/test/testanalyzerinformation.cpp index 579049ee0c2..f3035ff2286 100644 --- a/test/testanalyzerinformation.cpp +++ b/test/testanalyzerinformation.cpp @@ -38,6 +38,8 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "")); std::istringstream f2(filesTxt); ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f2, "./file1.c", "")); + ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "file1.c", "")); + ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "some/path/file1.c", "")); } }; From f27678f52f26368aab31573a31a513ca63765125 Mon Sep 17 00:00:00 2001 From: Jim Kuhn Date: Tue, 20 Sep 2022 19:03:45 -0400 Subject: [PATCH 2/2] Update testanalyzerinformation.cpp style (tabs -> spaces) --- test/testanalyzerinformation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/testanalyzerinformation.cpp b/test/testanalyzerinformation.cpp index f3035ff2286..a440074a6f4 100644 --- a/test/testanalyzerinformation.cpp +++ b/test/testanalyzerinformation.cpp @@ -38,8 +38,8 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "")); std::istringstream f2(filesTxt); ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f2, "./file1.c", "")); - ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "file1.c", "")); - ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "some/path/file1.c", "")); + ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "file1.c", "")); + ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "some/path/file1.c", "")); } };