Merge remote-tracking branch 'upstream/master' into cmd-runs

Author: xb058t

.github/workflows/config_coverage.yml

@@ -26,7 +26,7 @@ permissions: read-all
 jobs:
   checker-config-coverage:
     name: "Config coverage of checkers"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
   lint:
     name: Linters (pylint, pycodestyle)
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
 
   tools:
     name: Tools (report-converter, etc.)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
@@ -85,7 +85,7 @@ jobs:
 
   analyzer:
     name: Analyzer
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
@@ -111,7 +111,7 @@ jobs:
 
   common:
     name: Common libraries
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
@@ -130,7 +130,7 @@ jobs:
 
   web:
     name: Web
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -185,7 +185,7 @@ jobs:
 
   gui:
     name: GUI
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:

Makefile

@@ -63,11 +63,11 @@ package: package_dir_structure set_git_commit_template package_gerrit_skiplist
 	$(CC_BUILD_DIR)/config/web_version.json
 
 	${PYTHON_BIN} ./scripts/build/create_commands.py -b $(BUILD_DIR) \
-	  --cmd-dir $(ROOT)/codechecker_common/cmd \
-	    $(CC_WEB)/codechecker_web/cmd \
-	    $(CC_SERVER)/codechecker_server/cmd \
-	    $(CC_CLIENT)/codechecker_client/cmd \
-	    $(CC_ANALYZER)/codechecker_analyzer/cmd \
+	  --cmd-dir $(ROOT)/codechecker_common/cli_commands \
+	    $(CC_WEB)/codechecker_web/cli \
+	    $(CC_SERVER)/codechecker_server/cli \
+	    $(CC_CLIENT)/codechecker_client/cli \
+	    $(CC_ANALYZER)/codechecker_analyzer/cli \
 	  --bin-file $(ROOT)/bin/CodeChecker
 
 	# Copy license file.

analyzer/Makefile

@@ -116,8 +116,8 @@ package: package_analyzer
 
 	# Copy CodeChecker entry point sub-commands.
 	${PYTHON_BIN} $(ROOT)/scripts/build/create_commands.py -b $(BUILD_DIR) \
-	  --cmd-dir $(ROOT)/codechecker_common/cmd \
-	    $(CC_ANALYZER)/codechecker_analyzer/cmd \
+	  --cmd-dir $(ROOT)/codechecker_common/cli_commands \
+	    $(CC_ANALYZER)/codechecker_analyzer/cli \
 	  --bin-file $(ROOT)/bin/CodeChecker
 
 	# Copy license file.

analyzer/codechecker_analyzer/analysis_manager.py

@@ -692,7 +692,7 @@ def handle_analysis_result(success, zip_file=zip_file):
             result_file, action.source
 
     except Exception as e:
-        LOG.debug_analyzer(str(e))
+        LOG.debug(str(e))
         traceback.print_exc(file=sys.stdout)
         return 1, False, reanalyzed, action.analyzer_type, None, \
             action.source
@@ -830,7 +830,7 @@ def signal_handler(signum, _):
         LOG.info("----==== Summary ====----")
 
     for skp in skipped_actions:
-        LOG.debug_analyzer("%s is skipped", skp.source)
+        LOG.debug("%s is skipped", skp.source)
 
     LOG.info("Total analyzed compilation commands: %d",
              compile_cmd_count.analyze)

analyzer/codechecker_analyzer/analyzers/analyzer_types.py

@@ -232,7 +232,7 @@ def check_supported_analyzers(analyzers):
 def construct_analyzer(buildaction, analyzer_config):
     analyzer_type = buildaction.analyzer_type
 
-    LOG.debug_analyzer('Constructing %s analyzer.', analyzer_type)
+    LOG.debug('Constructing %s analyzer.', analyzer_type)
     if analyzer_type in supported_analyzers:
         analyzer = \
             supported_analyzers[analyzer_type](analyzer_config, buildaction)

analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py

@@ -12,11 +12,11 @@
 import os
 import plistlib
 import re
-import shlex
 import subprocess
+import sys
+from typing import List, Tuple
 
-from typing import List
-
+from codechecker_common import util
 from codechecker_common.logger import get_logger
 
 from codechecker_analyzer import analyzer_context, env
@@ -42,7 +42,7 @@
 def parse_clang_help_page(
     command: List[str],
     start_label: str
-) -> List[str]:
+) -> List[Tuple[str, str]]:
     """
     Parse the clang help page starting from a specific label.
     Returns a list of (flag, description) tuples.
@@ -121,6 +121,12 @@ class ClangSA(analyzer_base.SourceAnalyzer):
 
     __ctu_autodetection = None
 
+    __additional_analyzer_config = {
+        'cc-verbatim-args-file':
+            'A file path containing flags that are forwarded verbatim to the '
+            'analyzer tool. E.g.: cc-verbatim-args-file=<filepath>'
+    }
+
     def __init__(self, cfg_handler, buildaction):
         super().__init__(cfg_handler, buildaction)
         self.__disable_ctu = False
@@ -308,15 +314,17 @@ def get_checker_config(cls) -> List[str]:
         return parse_clang_help_page(command, 'OPTIONS:')
 
     @classmethod
-    def get_analyzer_config(cls) -> List[str]:
+    def get_analyzer_config(cls) -> List[Tuple[str, str]]:
         """Return the list of analyzer config options."""
         command = [cls.analyzer_binary(), "-cc1"]
 
         cls.__add_plugin_load_flags(command)
 
         command.append("-analyzer-config-help")
 
-        return parse_clang_help_page(command, 'OPTIONS:')
+        native_config = parse_clang_help_page(command, 'OPTIONS:')
+
+        return native_config + list(cls.__additional_analyzer_config.items())
 
     def post_analyze(self, result_handler):
         """
@@ -636,28 +644,13 @@ def construct_config_handler(cls, args):
                 'ctu_ast_mode' in args and \
                 args.ctu_ast_mode == 'parse-on-demand'
 
-        try:
-            with open(args.clangsa_args_cfg_file, 'r', encoding='utf8',
-                      errors='ignore') as sa_cfg:
-                handler.analyzer_extra_arguments = \
-                    re.sub(r'\$\((.*?)\)',
-                           env.replace_env_var(args.clangsa_args_cfg_file),
-                           sa_cfg.read().strip())
-                handler.analyzer_extra_arguments = \
-                    shlex.split(handler.analyzer_extra_arguments)
-        except IOError as ioerr:
-            LOG.debug_analyzer(ioerr)
-        except AttributeError as aerr:
-            # No clangsa arguments file was given in the command line.
-            LOG.debug_analyzer(aerr)
-
         checkers = ClangSA.get_analyzer_checkers()
 
         try:
             cmdline_checkers = args.ordered_checkers
         except AttributeError:
-            LOG.debug_analyzer('No checkers were defined in '
-                               'the command line for %s', cls.ANALYZER_NAME)
+            LOG.debug('No checkers were defined in the command line for %s',
+                      cls.ANALYZER_NAME)
             cmdline_checkers = []
 
         handler.initialize_checkers(
@@ -716,7 +709,19 @@ def construct_config_handler(cls, args):
         if 'analyzer_config' in args and \
                 isinstance(args.analyzer_config, list):
             for cfg in args.analyzer_config:
-                if cfg.analyzer == cls.ANALYZER_NAME:
+                # TODO: The analyzer plugin should get only its own analyzer
+                # config options from outside.
+                if cfg.analyzer != cls.ANALYZER_NAME:
+                    continue
+
+                if cfg.option == 'cc-verbatim-args-file':
+                    try:
+                        handler.analyzer_extra_arguments = \
+                            util.load_args_from_file(cfg.value)
+                    except FileNotFoundError:
+                        LOG.error(f"File not found: {cfg.value}")
+                        sys.exit(1)
+                else:
                     handler.checker_config.append(f"{cfg.option}={cfg.value}")
 
         return handler

analyzer/codechecker_analyzer/analyzers/clangsa/ctu_manager.py

@@ -107,7 +107,7 @@ def generate_invocation_list(triple_arch, action, source, config):
         {str(source_path): cmd},
         width=maxsize, Dumper=LLVMComatibleYamlDumper)
 
-    LOG.debug_analyzer("Appending invocation list item '%s'", invocation_line)
+    LOG.debug("Appending invocation list item '%s'", invocation_line)
 
     # Append the next entry into the invocation list yaml.
     with invocation_list.open('a', encoding='utf-8', errors='ignore') as \