try

Ericsson · Oct 3, 2023 · 97b04ee · 97b04ee
1 parent ad2c650
commit 97b04ee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/tools/report-converter/codechecker_report_converter/report/hash.py b/tools/report-converter/codechecker_report_converter/report/hash.py
@@ -87,8 +87,6 @@ def __get_report_hash_path_sensitive(report: Report) -> List[str]:
             LOG.error("Failed to generate report hash. %s does not exists!",
                       report.file.original_path)
 
-        assert line_content == ''
-
         hash_content = [report.file.name,
                         report.checker_name,
                         report.static_message,

diff --git a/tools/report-converter/codechecker_report_converter/report/parser/sarif.py b/tools/report-converter/codechecker_report_converter/report/parser/sarif.py
@@ -94,16 +94,6 @@ def get_reports(
                         bug_path_positions=thread_flow_info.bug_path_positions,
                         notes=thread_flow_info.notes,
                         macro_expansions=thread_flow_info.macro_expansions)
-                    print(file)
-                    print(rng.start_line)
-                    print(rng.start_col)
-                    print(message)
-                    print(rule_id)
-                    print(result_file_path)
-                    print(bug_path_events)
-                    print(thread_flow_info.bug_path_positions)
-                    print(thread_flow_info.notes)
-                    print(thread_flow_info.macro_expansions)
 
                     if report.report_hash is None:
                         report.report_hash = get_report_hash(

diff --git a/tools/report-converter/tests/unit/analyzers/gcc_output_test_files/double_free.cpp.sarif b/tools/report-converter/tests/unit/analyzers/gcc_output_test_files/double_free.cpp.sarif
@@ -43,13 +43,13 @@
       ],
       "originalUriBaseIds":{
         "PWD":{
-          "uri":"tests/unit/analyzers/gcc_output_test_files/out/"
+          "uri":"./"
         }
       },
       "artifacts":[
         {
           "location":{
-            "uri":"../files/double_free.cpp",
+            "uri":"files/double_free.cpp",
             "uriBaseId":"PWD"
           },
           "contents":{
@@ -77,7 +77,7 @@
             {
               "physicalLocation":{
                 "artifactLocation":{
-                  "uri":"../files/double_free.cpp",
+                  "uri":"files/double_free.cpp",
                   "uriBaseId":"PWD"
                 },
                 "region":{
@@ -111,7 +111,7 @@
                       "location":{
                         "physicalLocation":{
                           "artifactLocation":{
-                            "uri":"../files/double_free.cpp",
+                            "uri":"files/double_free.cpp",
                             "uriBaseId":"PWD"
                           },
                           "region":{
@@ -148,7 +148,7 @@
                       "location":{
                         "physicalLocation":{
                           "artifactLocation":{
-                            "uri":"../files/double_free.cpp",
+                            "uri":"files/double_free.cpp",
                             "uriBaseId":"PWD"
                           },
                           "region":{
@@ -185,7 +185,7 @@
                       "location":{
                         "physicalLocation":{
                           "artifactLocation":{
-                            "uri":"../files/double_free.cpp",
+                            "uri":"files/double_free.cpp",
                             "uriBaseId":"PWD"
                           },
                           "region":{

diff --git a/tools/report-converter/tests/unit/analyzers/test_gcc_parser.py b/tools/report-converter/tests/unit/analyzers/test_gcc_parser.py
@@ -40,10 +40,17 @@ def setup_class(self):
 
         self.test_files = os.path.join(os.path.dirname(__file__),
                                        'gcc_output_test_files')
+        global OLD_PWD
+        OLD_PWD = os.getcwd()
+        os.chdir(os.path.join(os.path.dirname(__file__),
+                              'gcc_output_test_files'))
 
     def teardown_class(self):
         """Clean up after the test."""
 
+        global OLD_PWD
+        os.chdir(OLD_PWD)
+
         global TEST_WORKSPACE
 
         print("Removing: " + TEST_WORKSPACE)