Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[server] Fix suppressing bug on the server #3563

Merged
merged 1 commit into from
Jan 12, 2022
Merged

[server] Fix suppressing bug on the server #3563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions web/server/codechecker_server/api/mass_store_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,6 @@ def set_review_status(report: Report):
comment.
"""
checker_name = report.checker_name
last_report_event = report.bug_path_events[-1]

# The original file path is needed here, not the trimmed, because
# the source files are extracted as the original file path.
Expand All @@ -818,7 +817,7 @@ def set_review_status(report: Report):
if not os.path.isfile(source_file_name):
return

report_line = last_report_event.range.end_line
report_line = report.line
source_file = os.path.basename(file_name)

src_comment_data = parse_codechecker_review_comment(
Expand Down
5 changes: 3 additions & 2 deletions web/tests/functional/review_status/review_status_files/divide_zero.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@

int test1(int z) {
if (z == 0){
// codechecker_intentional [core.DivideZero] intentional divide by zero here
int x = 1 / z; // warn
// codechecker_intentional [core.DivideZero] intentional multiline divide by zero here
int x = 1 /
z; // warn
return x;
}
}
Expand Down
29 changes: 15 additions & 14 deletions web/tests/functional/review_status/review_status_files/divide_zero.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>clang_version</key>
<string>clang version 12.0.0 (https://github.com/llvm/llvm-project.git 4f3559db1f313eed8bd84377de0fb2300a58125b)</string>
<string>clang version 13.0.0</string>
<key>diagnostics</key>
<array>
<dict>
Expand Down Expand Up @@ -123,8 +123,8 @@
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>13</integer>
<key>col</key><integer>17</integer>
<key>line</key><integer>14</integer>
<key>col</key><integer>7</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
Expand All @@ -141,7 +141,7 @@
<key>type</key><string>Division by zero</string>
<key>check_name</key><string>core.DivideZero</string>
<!-- This hash is experimental and going to change! -->
<key>issue_hash_content_of_line_in_context</key><string>0a6cf888769a0abb515c318411009cea</string>
<key>issue_hash_content_of_line_in_context</key><string>fbb2cdb4eddba27e931a2f49f69f3fb4</string>
<key>issue_context_kind</key><string>function</string>
<key>issue_context</key><string>test1</string>
<key>issue_hash_function_offset</key><string>3</string>
Expand All @@ -158,6 +158,7 @@
<integer>10</integer>
<integer>11</integer>
<integer>13</integer>
<integer>14</integer>
</array>
</dict>
</dict>
Expand All @@ -172,25 +173,25 @@
<key>start</key>
<array>
<dict>
<key>line</key><integer>19</integer>
<key>line</key><integer>20</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>19</integer>
<key>line</key><integer>20</integer>
<key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
<key>end</key>
<array>
<dict>
<key>line</key><integer>21</integer>
<key>line</key><integer>22</integer>
<key>col</key><integer>13</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>21</integer>
<key>line</key><integer>22</integer>
<key>col</key><integer>13</integer>
<key>file</key><integer>0</integer>
</dict>
Expand All @@ -202,20 +203,20 @@
<key>kind</key><string>event</string>
<key>location</key>
<dict>
<key>line</key><integer>21</integer>
<key>line</key><integer>22</integer>
<key>col</key><integer>13</integer>
<key>file</key><integer>0</integer>
</dict>
<key>ranges</key>
<array>
<array>
<dict>
<key>line</key><integer>21</integer>
<key>line</key><integer>22</integer>
<key>col</key><integer>11</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>21</integer>
<key>line</key><integer>22</integer>
<key>col</key><integer>15</integer>
<key>file</key><integer>0</integer>
</dict>
Expand All @@ -239,17 +240,17 @@
<key>issue_hash_function_offset</key><string>3</string>
<key>location</key>
<dict>
<key>line</key><integer>21</integer>
<key>line</key><integer>22</integer>
<key>col</key><integer>13</integer>
<key>file</key><integer>0</integer>
</dict>
<key>ExecutedLines</key>
<dict>
<key>0</key>
<array>
<integer>18</integer>
<integer>19</integer>
<integer>21</integer>
<integer>20</integer>
<integer>22</integer>
</array>
</dict>
</dict>
Expand Down