Merge pull request Ericsson#3635 from csordasmarton/fix_compile_comma…

…nd_uniqueing

[analyzer] Fix uniqueing compilation commands

analyzer/codechecker_analyzer/buildlog/log_parser.py

@@ -1297,8 +1297,8 @@ def parse_unique_log(compilation_database,
             if action.action_type != BuildAction.COMPILE:
                 continue
             if build_action_uniqueing == CompileActionUniqueingType.NONE:
-                if action.__hash__ not in uniqued_build_actions:
-                    uniqued_build_actions[action.__hash__] = action
+                if action not in uniqued_build_actions:
+                    uniqued_build_actions[action] = action
             elif build_action_uniqueing == CompileActionUniqueingType.STRICT:
                 if action.source not in uniqued_build_actions:
                     uniqued_build_actions[action.source] = action

analyzer/codechecker_analyzer/cmd/analyze.py

@@ -292,7 +292,7 @@ def add_arguments_to_parser(parser):
                              "compilation target. "
                              "If none of the above given, "
                              "this parameter should "
-                             "be a python regular expression."
+                             "be a python regular expression. "
                              "If there is more than one compilation action "
                              "for a source, "
                              "only the one is kept which matches the "

analyzer/codechecker_analyzer/cmd/check.py

@@ -221,7 +221,7 @@ def add_arguments_to_parser(parser):
                              "compilation target. "
                              "If none of the above given, "
                              "this parameter should "
-                             "be a python regular expression."
+                             "be a python regular expression. "
                              "If there is more than one compilation action "
                              "for a source, "
                              "only the one is kept which matches the "

analyzer/tests/functional/analyze/test_analyze.py

@@ -608,10 +608,20 @@ def test_tidyargs_saargs(self):
 
         self.assertIn("Dereference of null pointer", out)
 
-    def unique_json_helper(self, unique_json, is_a, is_b, is_s):
-        with open(unique_json,
+    def check_unique_compilation_db(
+        self,
+        compilation_db_file_path: str,
+        num_of_compile_commands: int,
+        is_a: bool,
+        is_b: bool,
+        is_s: bool
+    ):
+        """ """
+        with open(compilation_db_file_path,
                   encoding="utf-8", errors="ignore") as json_file:
             data = json.load(json_file)
+            self.assertEqual(len(data), num_of_compile_commands)
+
             simple_a = False
             simple_b = False
             success = False
@@ -646,6 +656,10 @@ def test_compile_uniqueing(self):
                       "command": "cc -c " + source_file +
                       " -Iincludes -o simple_a.o",
                       "file": source_file},
+                     {"directory": self.test_dir,
+                      "command": "cc -c " + source_file +
+                      " -Iincludes -o simple_a.o",
+                      "file": source_file},
                      {"directory": self.test_dir,
                       "command": "cc -c " + source_file2 +
                       " -Iincludes -o success.o",
@@ -673,7 +687,7 @@ def test_compile_uniqueing(self):
         self.assertEqual(errcode, 0)
         self.assertFalse(os.path.isdir(failed_dir))
 
-        self.unique_json_helper(unique_json, True, False, True)
+        self.check_unique_compilation_db(unique_json, 2, True, False, True)
 
         # Testing regex mode.
         analyze_cmd = [self._codechecker_cmd, "analyze", build_json,
@@ -692,7 +706,7 @@ def test_compile_uniqueing(self):
         self.assertEqual(errcode, 0)
         self.assertFalse(os.path.isdir(failed_dir))
 
-        self.unique_json_helper(unique_json, False, True, True)
+        self.check_unique_compilation_db(unique_json, 2, False, True, True)
 
         # Testing regex mode.error handling
         analyze_cmd = [self._codechecker_cmd, "analyze", build_json,
@@ -748,7 +762,7 @@ def test_compile_uniqueing(self):
         errcode = process.returncode
         self.assertEqual(errcode, 0)
         self.assertFalse(os.path.isdir(failed_dir))
-        self.unique_json_helper(unique_json, True, True, True)
+        self.check_unique_compilation_db(unique_json, 3, True, True, True)
 
     def test_invalid_enabled_checker_name(self):
         """Warn in case of an invalid enabled checker."""

docs/analyzer/user_guide.md

@@ -161,7 +161,7 @@ optional arguments:
                         compilation action for a source file, only the one is
                         kept that belongs to the alphabetically first
                         compilation target. If none of the above given, this
-                        parameter should be a python regular expression.If
+                        parameter should be a python regular expression. If
                         there is more than one compilation action for a
                         source, only the one is kept which matches the given
                         python regex. If more than one matches an error is
@@ -916,7 +916,7 @@ optional arguments:
                         compilation action for a source file, only the one is
                         kept that belongs to the alphabetically first
                         compilation target. If none of the above given, this
-                        parameter should be a python regular expression.If
+                        parameter should be a python regular expression. If
                         there is more than one compilation action for a
                         source, only the one is kept which matches the given
                         python regex. If more than one matches an error is