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

Author: danmar

cli/cppcheckexecutor.cpp

@@ -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));
     }
 }

test/cli/premium_test.py

@@ -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
@@ -97,3 +113,4 @@ def _get_hash(s:str):
 
     assert hash1 != hash2
 
+