walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

misra: optional interactions with premium addon

This commit is contained in:
Daniel Marjamäki 2022-02-16 19:05:59 +01:00
parent a1adbff683
commit bb8b9a8001
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/misra.py
View File

@ -25,6 +25,7 @@ import argparse
import codecs import codecs
import string import string
import copy import copy
import subprocess
try: try:
from itertools import izip as zip from itertools import izip as zip
@ -1317,6 +1318,8 @@ class MisraChecker:
self._ctu_summary_identifiers = False self._ctu_summary_identifiers = False
self._ctu_summary_usage = False self._ctu_summary_usage = False
self.premium_addon = None
def __repr__(self): def __repr__(self):
attrs = ["settings", "verify_expected", "verify_actual", "violations", attrs = ["settings", "verify_expected", "verify_actual", "violations",
"ruleTexts", "suppressedRules", "filePrefix", "ruleTexts", "suppressedRules", "filePrefix",
@ -4045,6 +4048,9 @@ class MisraChecker:
misra_severity = self.ruleTexts[ruleNum].misra_severity misra_severity = self.ruleTexts[ruleNum].misra_severity
cppcheck_severity = self.ruleTexts[ruleNum].cppcheck_severity cppcheck_severity = self.ruleTexts[ruleNum].cppcheck_severity
elif len(self.ruleTexts) == 0: elif len(self.ruleTexts) == 0:
if self.premium_addon:
errmsg = subprocess.check_output([self.premium_addon, '--get-rule-text=' + errorId]).strip().decode('ascii')
else:
errmsg = 'misra violation (use --rule-texts=<file> to get proper output)' errmsg = 'misra violation (use --rule-texts=<file> to get proper output)'
else: else:
errmsg = 'misra violation %s with no text in the supplied rule-texts-file' % (ruleNum) errmsg = 'misra violation %s with no text in the supplied rule-texts-file' % (ruleNum)
@ -4379,6 +4385,10 @@ class MisraChecker:
self.executeCheck(2209, self.misra_22_9, cfg) self.executeCheck(2209, self.misra_22_9, cfg)
self.executeCheck(2210, self.misra_22_10, cfg) self.executeCheck(2210, self.misra_22_10, cfg)
# Premium MISRA checking, deep analysis
if cfgNumber == 0 and self.premium_addon:
subprocess.call([self.premium_addon, '--misra', dumpfile])
def analyse_ctu_info(self, ctu_info_files): def analyse_ctu_info(self, ctu_info_files):
all_typedef_info = [] all_typedef_info = []
all_tagname_info = [] all_tagname_info = []
@ -4562,6 +4572,7 @@ def get_args_parser():
parser.add_argument("-generate-table", help=argparse.SUPPRESS, action="store_true") parser.add_argument("-generate-table", help=argparse.SUPPRESS, action="store_true")
parser.add_argument("-verify", help=argparse.SUPPRESS, action="store_true") parser.add_argument("-verify", help=argparse.SUPPRESS, action="store_true")
parser.add_argument("--severity", type=str, help="Set a custom severity string, for example 'error' or 'warning'. ") parser.add_argument("--severity", type=str, help="Set a custom severity string, for example 'error' or 'warning'. ")
parser.add_argument("--premium-addon", type=str, default=None, help=argparse.SUPPRESS)
return parser return parser
@ -4571,6 +4582,8 @@ def main():
settings = MisraSettings(args) settings = MisraSettings(args)
checker = MisraChecker(settings) checker = MisraChecker(settings)
checker.premium_addon = args.premium_addon
if args.generate_table: if args.generate_table:
generateTable() generateTable()
sys.exit(0) sys.exit(0)
@ -4632,6 +4645,13 @@ def main():
checker.analyse_ctu_info(ctu_info_files) checker.analyse_ctu_info(ctu_info_files)
if args.file_list and args.premium_addon:
premium_command = [args.premium_addon, '--misra', '--file-list', args.file_list]
if args.cli:
premium_command.append('--cli')
for line in subprocess.check_output(premium_command).decode('ascii').split('\n'):
print(line.strip())
if settings.verify: if settings.verify:
sys.exit(exitCode) sys.exit(exitCode)