feat(analyzer): make analyze-headers configurable

Author: gamesh411

analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py

@@ -507,11 +507,13 @@ def construct_analyzer_cmd(self, result_handler):
 
             analyzer_mode = 'plist-multi-file'
             analyzer_cmd.extend(['-Xclang',
-                                 '-analyzer-opt-analyze-headers',
-                                 '-Xclang',
                                  '-analyzer-output=' + analyzer_mode,
                                  '-o', analyzer_output_file])
 
+            if config.analyze_headers:
+                analyzer_cmd.extend(['-Xclang',
+                                     '-analyzer-opt-analyze-headers'])
+
             # Expand macros in plist output on the bug path.
             analyzer_cmd.extend(['-Xclang',
                                  '-analyzer-config',
@@ -755,6 +757,9 @@ def construct_config_handler(cls, args):
             'add_gcc_include_dirs_with_isystem' in args and \
             args.add_gcc_include_dirs_with_isystem
 
+        handler.analyze_headers = 'analyze_headers' in args and \
+            args.analyze_headers
+
         if 'ctu_phases' in args:
             handler.ctu_dir = os.path.join(args.output_path,
                                            args.ctu_dir)

analyzer/codechecker_analyzer/analyzers/config_handler.py

@@ -54,6 +54,7 @@ def __init__(self):
         self.analyzer_config = None
         self.report_hash = None
         self.enable_all = None
+        self.analyze_headers = None
 
         # The key is the checker name, the value is a tuple of CheckerState and
         # checker description.

analyzer/codechecker_analyzer/cli/analyze.py

@@ -436,6 +436,14 @@ def add_arguments_to_parser(parser):
                                     "cppcheck:cc-verbatim-args-file="
                                     "<filepath>")
 
+    analyzer_opts.add_argument('--analyze-headers',
+                               dest="analyze_headers",
+                               required=False,
+                               action='store_true',
+                               default=False,
+                               help="Enable the analysis in the header files "
+                                    "in Clang SA.")
+
     analyzer_opts.add_argument('--saargs',
                                dest="clangsa_args_cfg_file",
                                required=False,

analyzer/tests/unit/test_analyzer_command.py

@@ -63,3 +63,23 @@ def test_isystem_idirafter(self):
         result_handler = create_result_handler(analyzer)
         cmd = analyzer.construct_analyzer_cmd(result_handler)
         self.assertIn('-idirafter', cmd)
+
+    def test_no_analyze_headers(self):
+        """
+        Test that the -analyzer-opt-analyze-headers flag is NOT present in the
+        analyzer command by default.
+        """
+        analyzer = create_analyzer_sa()
+        result_handler = create_result_handler(analyzer)
+        cmd = analyzer.construct_analyzer_cmd(result_handler)
+        self.assertNotIn('-analyzer-opt-analyze-headers', cmd)
+
+    def test_analyze_headers_on(self):
+        """
+        Test that the -analyzer-opt-analyze-headers flag IS present in the
+        analyzer command when requested.
+        """
+        analyzer = create_analyzer_sa(['--analyze-headers'])
+        result_handler = create_result_handler(analyzer)
+        cmd = analyzer.construct_analyzer_cmd(result_handler)
+        self.assertIn('-analyzer-opt-analyze-headers', cmd)