Apply suggestions from code review

Co-authored-by: bruntib <bruntib@users.noreply.github.com>
dkrupp · Aug 14, 2024 · 440a90b · 440a90b
1 parent 07e18f2
commit 440a90b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/analyzer/codechecker_analyzer/analyzers/analyzer_types.py b/analyzer/codechecker_analyzer/analyzers/analyzer_types.py
@@ -105,7 +105,8 @@ def is_ignore_conflict_supported():
                             stdout=subprocess.PIPE,
                             stderr=subprocess.PIPE,
                             env=context
-                            .get_analyzer_env("clang-apply-replacements"),
+                            .get_analyzer_env(
+                                os.path.basename(context.replacer_binary)),
                             encoding="utf-8", errors="ignore")
     out, _ = proc.communicate()
     return '--ignore-insert-conflict' in out

diff --git a/analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py b/analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py
@@ -51,7 +51,8 @@ def parse_clang_help_page(
         help_page = subprocess.check_output(
             command,
             stderr=subprocess.STDOUT,
-            env=analyzer_context.get_context().get_analyzer_env("clangsa"),
+            env=analyzer_context.get_context()\
+            .get_analyzer_env(ClangSA.ANALYZER_NAME),
             universal_newlines=True,
             encoding="utf-8",
             errors="ignore")
@@ -207,7 +208,8 @@ def ctu_capability(cls):
         if not cls.__ctu_autodetection:
             cls.__ctu_autodetection = CTUAutodetection(
                 cls.analyzer_binary(),
-                analyzer_context.get_context().get_analyzer_env("clangsa"))
+                analyzer_context.get_context()\
+                .get_analyzer_env(ClangSA.ANALYZER_NAME))
 
         return cls.__ctu_autodetection
 
@@ -606,7 +608,7 @@ def construct_result_handler(self, buildaction, report_output,
     def construct_config_handler(cls, args):
 
         context = analyzer_context.get_context()
-        environ = context.get_analyzer_env("clangsa")
+        environ = context.get_analyzer_env(ClangSA.ANALYZER_NAME)
 
         handler = config_handler.ClangSAConfigHandler(environ)
 

diff --git a/analyzer/codechecker_analyzer/analyzers/clangtidy/analyzer.py b/analyzer/codechecker_analyzer/analyzers/clangtidy/analyzer.py
@@ -271,7 +271,7 @@ def get_analyzer_checkers(cls):
                 return cls.__analyzer_checkers
 
             environ = analyzer_context\
-                .get_context().get_analyzer_env("clang-tidy")
+                .get_context().get_analyzer_env(cls.ANALYZER_NAME)
             result = subprocess.check_output(
                 [cls.analyzer_binary(), "-list-checks", "-checks=*"],
                 env=environ,
@@ -299,7 +299,7 @@ def get_checker_config(cls):
             result = subprocess.check_output(
                 [cls.analyzer_binary(), "-dump-config", "-checks=*"],
                 env=analyzer_context.get_context()
-                .get_analyzer_env("clang-tidy"),
+                .get_analyzer_env(cls.ANALYZER_NAME),
                 universal_newlines=True,
                 encoding="utf-8",
                 errors="ignore")
@@ -316,7 +316,7 @@ def get_analyzer_config(cls):
             result = subprocess.check_output(
                 [cls.analyzer_binary(), "-dump-config", "-checks=*"],
                 env=analyzer_context.get_context()
-                .get_analyzer_env("clang-tidy"),
+                .get_analyzer_env(cls.ANALYZER_NAME),
                 universal_newlines=True,
                 encoding="utf-8",
                 errors="ignore")

diff --git a/analyzer/codechecker_analyzer/analyzers/cppcheck/analyzer.py b/analyzer/codechecker_analyzer/analyzers/cppcheck/analyzer.py
@@ -393,7 +393,7 @@ def construct_config_handler(cls, args):
             # No cppcheck arguments file was given in the command line.
             LOG.debug_analyzer(aerr)
 
-        check_env = context.get_analyzer_env("cppcheck")
+        check_env = context.get_analyzer_env(cls.ANALYZER_NAME)
 
         # Overwrite PATH to contain only the parent of the cppcheck binary.
         if os.path.isabs(Cppcheck.analyzer_binary()):