[analyzer] Add the 'executable' config to all analyzers

analyzer/codechecker_analyzer/analyzer.py

@@ -143,6 +143,7 @@ def perform_analysis(args, skip_handlers, actions, metadata_tool,
 
     analyzers = args.analyzers if 'analyzers' in args \
         else analyzer_types.supported_analyzers
+    config_map = analyzer_types.build_config_handlers(args, analyzers)
     analyzers, errored = analyzer_types.check_supported_analyzers(analyzers)
     analyzer_types.check_available_analyzers(analyzers, errored)
 
@@ -164,8 +165,6 @@ def perform_analysis(args, skip_handlers, actions, metadata_tool,
                       "the Clang Static Analyzer.")
             return
 
-    config_map = analyzer_types.build_config_handlers(args, analyzers)
-
     no_checker_analyzers = \
         [a for a in analyzers if not __has_enabled_checker(config_map[a])]
     for analyzer in no_checker_analyzers:
@@ -226,7 +225,8 @@ def perform_analysis(args, skip_handlers, actions, metadata_tool,
 
         # TODO: cppcheck may require a different environment than clang.
         version = analyzer_types.supported_analyzers[analyzer] \
-            .get_version(context.analyzer_env)
+            .get_binary_version(context.analyzer_binaries[analyzer],
+                                context.analyzer_env)
         metadata_info['analyzer_statistics']['version'] = version
 
         metadata_tool['analyzers'][analyzer] = metadata_info

analyzer/codechecker_analyzer/analyzers/analyzer_base.py

@@ -25,6 +25,15 @@
 LOG = get_logger('analyzer')
 
 
+def handle_analyzer_executable_from_config(analyzer_name, path):
+    context = analyzer_context.get_context()
+    if not os.path.isfile(path):
+        LOG.error(f"'{path}' is not a path to an analyzer binary "
+                  f"given to --analyzer-config={analyzer_name}:executable!")
+        sys.exit(1)
+    context.analyzer_binaries[analyzer_name] = path
+
+
 class SourceAnalyzer(metaclass=ABCMeta):
     """
     Base class for different source analyzers.
@@ -56,6 +65,17 @@ def resolve_missing_binary(cls, configured_binary, environ):
         """
         raise NotImplementedError("Subclasses should implement this!")
 
+    @abstractmethod
+    def get_binary_version(self, configured_binary, environ, details=False) \
+            -> str:
+        """
+        Return the version number of the binary that CodeChecker found, even
+        if its incompatible. If details is true, additional version information
+        is provided. If details is false, the return value should be
+        convertible to a distutils.version.StrictVersion type.
+        """
+        raise NotImplementedError("Subclasses should implement this!")
+
     @classmethod
     def is_binary_version_incompatible(cls, configured_binary, environ) \
             -> Optional[str]:

analyzer/codechecker_analyzer/analyzers/analyzer_types.py

@@ -221,8 +221,7 @@ def construct_analyzer(buildaction,
             LOG.error('Unsupported analyzer type: %s', analyzer_type)
         return analyzer
 
-    except Exception as ex:
-        LOG.debug_analyzer(ex)
+    except Exception:
         # We should've detected well before this point that something is off
         # with the analyzer. We can't recover here.
         raise

analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py

@@ -41,7 +41,8 @@
 
 def parse_clang_help_page(
     command: List[str],
-    start_label: str
+    start_label: str,
+    starting_value: (str, str) = None
 ) -> List[str]:
     """
     Parse the clang help page starting from a specific label.
@@ -75,6 +76,8 @@ def parse_clang_help_page(
         re.compile(r"^\s{3,}(?P<desc>[^\n]+)$")
 
     res = []
+    if starting_value:
+        res.append(starting_value)
 
     flag = None
     desc = []
@@ -171,16 +174,19 @@ def __add_plugin_load_flags(cls, analyzer_cmd: List[str]):
             analyzer_cmd.extend(["-load", plugin])
 
     @classmethod
-    def get_version(cls, env=None):
-        """ Get analyzer version information. """
-        version = [cls.analyzer_binary(), '--version']
+    def get_binary_version(self, configured_binary, environ, details=False) \
+            -> str:
+        if details:
+            version = [configured_binary, '--version']
+        else:
+            version = [configured_binary, '-dumpversion']
         try:
             output = subprocess.check_output(version,
-                                             env=env,
+                                             env=environ,
                                              universal_newlines=True,
                                              encoding="utf-8",
                                              errors="ignore")
-            return output
+            return output.strip()
         except (subprocess.CalledProcessError, OSError) as oerr:
             LOG.warning("Failed to get analyzer version: %s",
                         ' '.join(version))
@@ -305,7 +311,11 @@ def get_analyzer_config(cls) -> List[str]:
 
         command.append("-analyzer-config-help")
 
-        return parse_clang_help_page(command, 'OPTIONS:')
+        return parse_clang_help_page(
+            command, 'OPTIONS:',
+            ("executable", "Use the specified analyzer binary. This "
+                           "supersedes any other method CodeChecker might use "
+                           "to get hold of one."))
 
     def post_analyze(self, result_handler):
         """
@@ -604,6 +614,22 @@ def construct_config_handler(cls, args):
 
         handler = config_handler.ClangSAConfigHandler(environ)
 
+        handler.checker_config = []
+
+        # TODO: This extra "isinstance" check is needed for
+        # CodeChecker analyzers --analyzer-config. This command also runs
+        # this function in order to construct a config handler.
+        if 'analyzer_config' in args and \
+                isinstance(args.analyzer_config, list):
+            for cfg in args.analyzer_config:
+                if cfg.analyzer == cls.ANALYZER_NAME:
+                    if cfg.option == 'executable':
+                        analyzer_base.handle_analyzer_executable_from_config(
+                                cfg.analyzer, cfg.value)
+                        LOG.info(f"Using clangsa binary '{cfg.value}'")
+                        continue
+                    handler.checker_config.append(f"{cfg.option}={cfg.value}")
+
         handler.report_hash = args.report_hash \
             if 'report_hash' in args else None
 
@@ -682,8 +708,6 @@ def construct_config_handler(cls, args):
         handler.set_checker_enabled(
             ReturnValueCollector.checker_collect, False)
 
-        handler.checker_config = []
-
         # TODO: This extra "isinstance" check is needed for
         # CodeChecker checkers --checker-config. This command also runs
         # this function in order to construct a config handler.
@@ -693,13 +717,4 @@ def construct_config_handler(cls, args):
                     handler.checker_config.append(
                         f"{cfg.checker}:{cfg.option}={cfg.value}")
 
-        # TODO: This extra "isinstance" check is needed for
-        # CodeChecker analyzers --analyzer-config. This command also runs
-        # this function in order to construct a config handler.
-        if 'analyzer_config' in args and \
-                isinstance(args.analyzer_config, list):
-            for cfg in args.analyzer_config:
-                if cfg.analyzer == cls.ANALYZER_NAME:
-                    handler.checker_config.append(f"{cfg.option}={cfg.value}")
-
         return handler

analyzer/codechecker_analyzer/analyzers/clangtidy/analyzer.py

@@ -204,6 +204,16 @@ def need_asterisk(checker: str) -> bool:
     return result
 
 
+def parse_version(tidy_output):
+    """
+    Parse clang-tidy version output and return the version number.
+    """
+    version_re = re.compile(r'.*version (?P<version>[\d\.]+)', re.S)
+    match = version_re.match(tidy_output)
+    if match:
+        return match.group('version')
+
+
 class ClangTidy(analyzer_base.SourceAnalyzer):
     """
     Constructs the clang tidy analyzer commands.
@@ -220,16 +230,18 @@ def analyzer_binary(cls):
             .analyzer_binaries[cls.ANALYZER_NAME]
 
     @classmethod
-    def get_version(cls, env=None):
-        """ Get analyzer version information. """
-        version = [cls.analyzer_binary(), '--version']
+    def get_binary_version(self, configured_binary, environ, details=False) \
+            -> str:
+        version = [configured_binary, '--version']
         try:
             output = subprocess.check_output(version,
-                                             env=env,
+                                             env=environ,
                                              universal_newlines=True,
                                              encoding="utf-8",
                                              errors="ignore")
-            return output
+            if details:
+                return output.strip()
+            return parse_version(output)
         except (subprocess.CalledProcessError, OSError) as oerr:
             LOG.warning("Failed to get analyzer version: %s",
                         ' '.join(version))
@@ -289,16 +301,22 @@ def get_analyzer_config(cls):
         """
         Return the analyzer configuration with all checkers enabled.
         """
+
+        tidy_configs = [
+            ("executable", "Use the specified analyzer binary. This "
+                           "supersedes any other method CodeChecker might use "
+                           "to get hold of one.")]
         try:
             result = subprocess.check_output(
                 [cls.analyzer_binary(), "-dump-config", "-checks=*"],
                 env=analyzer_context.get_context().analyzer_env,
                 universal_newlines=True,
                 encoding="utf-8",
                 errors="ignore")
-            return parse_analyzer_config(result)
+            tidy_configs.extend(parse_analyzer_config(result))
         except (subprocess.CalledProcessError, OSError):
-            return []
+            pass
+        return tidy_configs
 
     def get_checker_list(self, config) -> Tuple[List[str], List[str]]:
         """
@@ -557,6 +575,26 @@ def construct_config_handler(cls, args):
         handler.report_hash = args.report_hash \
             if 'report_hash' in args else None
 
+        analyzer_config = {}
+        # TODO: This extra "isinstance" check is needed for
+        # CodeChecker analyzers --analyzer-config. This command also
+        # runs this function in order to construct a config handler.
+        if 'analyzer_config' in args and \
+                isinstance(args.analyzer_config, list):
+            for cfg in args.analyzer_config:
+                if cfg.analyzer == cls.ANALYZER_NAME:
+                    if cfg.option == 'executable':
+                        analyzer_base.handle_analyzer_executable_from_config(
+                                cfg.analyzer, cfg.value)
+                        LOG.info(f"Using clang-tidy binary '{cfg.value}'")
+                        continue
+                    analyzer_config[cfg.option] = cfg.value
+
+        # Reports in headers are hidden by default in clang-tidy. Re-enable it
+        # if the analyzer doesn't provide any other config options.
+        if not analyzer_config:
+            analyzer_config["HeaderFilterRegex"] = ".*"
+
         # FIXME We cannot get the resource dir from the clang-tidy binary,
         # therefore we get a sibling clang binary which of clang-tidy.
         # TODO Support "clang-tidy -print-resource-dir" .
@@ -575,21 +613,6 @@ def construct_config_handler(cls, args):
             # No clang tidy arguments file was given in the command line.
             LOG.debug_analyzer(aerr)
 
-        analyzer_config = {}
-        # TODO: This extra "isinstance" check is needed for
-        # CodeChecker analyzers --analyzer-config. This command also
-        # runs this function in order to construct a config handler.
-        if 'analyzer_config' in args and \
-                isinstance(args.analyzer_config, list):
-            for cfg in args.analyzer_config:
-                if cfg.analyzer == cls.ANALYZER_NAME:
-                    analyzer_config[cfg.option] = cfg.value
-
-        # Reports in headers are hidden by default in clang-tidy. Re-enable it
-        # if the analyzer doesn't provide any other config options.
-        if not analyzer_config:
-            analyzer_config["HeaderFilterRegex"] = ".*"
-
         # If both --analyzer-config and -config (in --tidyargs) is given then
         # these need to be merged. Since "HeaderFilterRegex" has a default
         # value in --analyzer-config, we take --tidyargs stronger so user can

analyzer/codechecker_analyzer/analyzers/cppcheck/analyzer.py

@@ -67,7 +67,7 @@ def parse_version(cppcheck_output):
     version_re = re.compile(r'^Cppcheck (?P<version>[\d\.]+)')
     match = version_re.match(cppcheck_output)
     if match:
-        return StrictVersion(match.group('version'))
+        return match.group('version')
 
 
 class Cppcheck(analyzer_base.SourceAnalyzer):
@@ -83,16 +83,19 @@ def analyzer_binary(cls):
             .analyzer_binaries[cls.ANALYZER_NAME]
 
     @classmethod
-    def get_version(cls, env=None):
+    def get_binary_version(self, configured_binary, environ, details=False) \
+            -> str:
         """ Get analyzer version information. """
-        version = [cls.analyzer_binary(), '--version']
+        version = [configured_binary, '--version']
         try:
             output = subprocess.check_output(version,
-                                             env=env,
+                                             env=environ,
                                              universal_newlines=True,
                                              encoding="utf-8",
                                              errors="ignore")
-            return output
+            if details:
+                return output.strip()
+            return parse_version(output)
         except (subprocess.CalledProcessError, OSError) as oerr:
             LOG.warning("Failed to get analyzer version: %s",
                         ' '.join(version))
@@ -257,11 +260,13 @@ def get_analyzer_config(cls):
         """
         Config options for cppcheck.
         """
-        return [("addons", "A list of cppcheck addon files."),
+        return [("executable", "Use the specified analyzer binary. This "
+                               "supersedes any other method CodeChecker might "
+                               "use to get hold of one."),
+                ("addons", "A list of cppcheck addon files."),
                 ("libraries", "A list of cppcheck library definiton files."),
                 ("platform", "The platform configuration .xml file."),
-                ("inconclusive", "Enable inconclusive reports.")
-                ]
+                ("inconclusive", "Enable inconclusive reports.")]
 
     @classmethod
     def get_checker_config(cls):
@@ -333,34 +338,17 @@ def resolve_missing_binary(cls, configured_binary, env):
             LOG.debug("Using '%s' for Cppcheck!", cppcheck)
         return cppcheck
 
-    @classmethod
-    def __get_analyzer_version(cls, analyzer_binary, env):
-        """
-        Return the analyzer version.
-        """
-        command = [analyzer_binary, "--version"]
-
-        try:
-            result = subprocess.check_output(
-                    command,
-                    env=env,
-                    encoding="utf-8",
-                    errors="ignore")
-            return parse_version(result)
-        except (subprocess.CalledProcessError, OSError):
-            return []
-
     @classmethod
     def is_binary_version_incompatible(cls, configured_binary, environ):
         """
         Check the version compatibility of the given analyzer binary.
         """
         analyzer_version = \
-            cls.__get_analyzer_version(configured_binary, environ)
+            cls.get_binary_version(configured_binary, environ)
 
         # The analyzer version should be above 1.80 because '--plist-output'
         # argument was introduced in this release.
-        if analyzer_version >= StrictVersion("1.80"):
+        if StrictVersion(analyzer_version) >= StrictVersion("1.80"):
             return None
 
         return "CppCheck binary found is too old at " \
@@ -389,6 +377,11 @@ def construct_config_handler(cls, args):
                 isinstance(args.analyzer_config, list):
             for cfg in args.analyzer_config:
                 if cfg.analyzer == cls.ANALYZER_NAME:
+                    if cfg.option == 'executable':
+                        analyzer_base.handle_analyzer_executable_from_config(
+                                cfg.analyzer, cfg.value)
+                        LOG.info(f"Using cppcheck binary '{cfg.value}'")
+                        continue
                     analyzer_config[cfg.option].append(cfg.value)
 
         handler.analyzer_config = analyzer_config