Skip to content

Fix #13633 (safety: the xml version 3 report should show safety properties) #7298

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

Merged
danmar merged 1 commit into from
Feb 24, 2025
Merged

Fix #13633 (safety: the xml version 3 report should show safety properties) #7298

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
9 changes: 9 additions & 0 deletions cli/cppcheckexecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,15 @@ void StdLogger::writeCheckersReport(const Suppressions& supprs)

if (xmlReport) {
reportErr(" </errors>\n");
if (mSettings.safety)
reportErr(" <safety/>\n");
if (mSettings.inlineSuppressions)
reportErr(" <inline-suppr/>\n");
if (!suppressions.empty()) {
std::ostringstream suppressionsXml;
supprs.nomsg.dump(suppressionsXml);
reportErr(suppressionsXml.str());
}
reportErr(checkersReport.getXmlReport(mCriticalErrors));
}
}
Expand Down
17 changes: 17 additions & 0 deletions test/cli/premium_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,22 @@ def test_misra_c_builtin_style_checks(tmpdir):
assert 'id="unusedVariable"' in stderr
assert 'id="checkersReport"' not in stderr

exitcode, _, stderr = cppcheck(['--xml-version=3', test_file], cppcheck_exe=exe)
assert exitcode == 0
assert '<safety/>' in stderr

exitcode, _, stderr = cppcheck(['--xml-version=3', '--premium=safety-off', test_file], cppcheck_exe=exe)
assert exitcode == 0
assert '<safety/>' not in stderr

exitcode, _, stderr = cppcheck(['--xml-version=3', '--inline-suppr', test_file], cppcheck_exe=exe)
assert exitcode == 0
assert '<inline-suppr/>' in stderr

exitcode, _, stderr = cppcheck(['--xml-version=3', '--suppress=foo', test_file], cppcheck_exe=exe)
assert exitcode == 0
assert '<suppression errorId="foo" />' in stderr


def test_build_dir_hash_cppcheck_product(tmpdir):
# 13644 - cppcheck build dir hashes should depend on the cppcheck version
Expand Down Expand Up @@ -97,3 +113,4 @@ def _get_hash(s:str):

assert hash1 != hash2