Library: removed "one path down" from library lookup

danmar · Jul 1, 2024 · 8fb5a1f · 8fb5a1f
1 parent 29adee8
commit 8fb5a1f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/lib/library.cpp b/lib/library.cpp
@@ -117,7 +117,6 @@ Library::Error Library::load(const char exename[], const char path[], bool debug
             if (exename) {
                 const std::string exepath(Path::fromNativeSeparators(Path::getPathFromFilename(Path::getCurrentExecutablePath(exename))));
                 cfgfolders.push_back(exepath + "cfg");
-                cfgfolders.push_back(exepath + "../cfg");
                 cfgfolders.push_back(exepath);
             }
 

diff --git a/test/cli/other_test.py b/test/cli/other_test.py
@@ -12,7 +12,6 @@
 def __remove_std_lookup_log(l : list, exepath):
     l.remove("looking for library 'std.cfg'")
     l.remove("looking for library '{}/std.cfg'".format(exepath))
-    l.remove("looking for library '{}/../cfg/std.cfg'".format(exepath))
     l.remove("looking for library '{}/cfg/std.cfg'".format(exepath))
     return l
 
@@ -1633,7 +1632,6 @@ def test_lib_lookup(tmpdir):
         "looking for library 'gnu'",
         "looking for library 'gnu.cfg'",
         "looking for library '{}/gnu.cfg'".format(exepath),
-        "looking for library '{}/../cfg/gnu.cfg'".format(exepath),
         "looking for library '{}/cfg/gnu.cfg'".format(exepath),
         'Checking {} ...'.format(test_file)
     ]
@@ -1655,7 +1653,6 @@ def test_lib_lookup_notfound(tmpdir):
         "looking for library 'none'",
         "looking for library 'none.cfg'",
         "looking for library '{}/none.cfg'".format(exepath),
-        "looking for library '{}/../cfg/none.cfg'".format(exepath),
         "looking for library '{}/cfg/none.cfg'".format(exepath),
         "library not found: 'none'",
         "cppcheck: Failed to load library configuration file 'none'. File not found"
@@ -1728,7 +1725,6 @@ def test_lib_lookup_nofile(tmpdir):
         "looking for library 'gtk'",
         "looking for library 'gtk.cfg'",
         "looking for library '{}/gtk.cfg'".format(exepath),
-        "looking for library '{}/../cfg/gtk.cfg'".format(exepath),
         "looking for library '{}/cfg/gtk.cfg'".format(exepath),
         'Checking {} ...'.format(test_file)
     ]