CmdLineParser: cppcheck.cfg was not loaded from executable folder f…

…or exclusive options
danmar · Dec 1, 2023 · 4575efe · 4575efe
1 parent 2a7706b
commit 4575efe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -728,7 +728,7 @@ test/testclangimport.o: test/testclangimport.cpp lib/addoninfo.h lib/check.h lib
 test/testclass.o: test/testclass.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp
 
-test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
 
 test/testcolor.o: test/testcolor.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -282,6 +282,8 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
 // TODO: error out on all missing given files/paths
 CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const argv[])
 {
+    mSettings.exename = Path::getCurrentExecutablePath(argv[0]);
+
     if (argc <= 1) {
         printHelp();
         return Result::Exit;
@@ -345,8 +347,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
     ImportProject project;
 
-    mSettings.exename = Path::getCurrentExecutablePath(argv[0]);
-
     for (int i = 1; i < argc; i++) {
         if (argv[i][0] == '-') {
             // User define

diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -22,6 +22,7 @@
 #include "cppcheckexecutor.h"
 #include "errortypes.h"
 #include "helpers.h"
+#include "path.h"
 #include "platform.h"
 #include "redirect.h"
 #include "settings.h"
@@ -417,7 +418,7 @@ class TestCmdlineParser : public TestFixture {
 
     void versionWithCfg() {
         REDIRECT;
-        ScopedFile file("cppcheck.cfg",
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
                         "{\n"
                         "\"productName\": \"The Product\""
                         "}\n");
@@ -440,7 +441,7 @@ class TestCmdlineParser : public TestFixture {
 
     void versionWithInvalidCfg() {
         REDIRECT;
-        ScopedFile file("cppcheck.cfg",
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
                         "{\n");
         const char * const argv[] = {"cppcheck", "--version"};
         ASSERT_EQUALS(CmdLineParser::Result::Fail, parser->parseFromArgs(2, argv));
@@ -1711,7 +1712,7 @@ class TestCmdlineParser : public TestFixture {
 
     void errorlistWithCfg() {
         REDIRECT;
-        ScopedFile file("cppcheck.cfg",
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
                         R"({"productName": "The Product"}\n)");
         const char * const argv[] = {"cppcheck", "--errorlist"};
         ASSERT_EQUALS(CmdLineParser::Result::Exit, parser->parseFromArgs(2, argv));
@@ -1730,7 +1731,7 @@ class TestCmdlineParser : public TestFixture {
 
     void errorlistWithInvalidCfg() {
         REDIRECT;
-        ScopedFile file("cppcheck.cfg",
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
                         "{\n");
         const char * const argv[] = {"cppcheck", "--errorlist"};
         ASSERT_EQUALS(CmdLineParser::Result::Fail, parser->parseFromArgs(2, argv));
@@ -2345,7 +2346,7 @@ class TestCmdlineParser : public TestFixture {
 
     void invalidCppcheckCfg() {
         REDIRECT;
-        ScopedFile file("cppcheck.cfg",
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
                         "{\n");
         const char * const argv[] = {"cppcheck", "test.cpp"};
         ASSERT_EQUALS(CmdLineParser::Result::Fail, parser->parseFromArgs(2, argv));