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

Missing rule-text-file to not stop the analysis (#4458)

This commit is contained in:
dzid26 2022-09-12 11:55:07 +01:00 committed by GitHub
parent 43caa32abf
commit 3887d6dde1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/misra.py
View File

@ -1293,6 +1293,7 @@ class MisraChecker:
# by rule number (in hundreds). # by rule number (in hundreds).
# ie rule 1.2 becomes 102 # ie rule 1.2 becomes 102
self.ruleTexts = dict() self.ruleTexts = dict()
self.ruleText_filename = None
# Dictionary of dictionaries for rules to suppress # Dictionary of dictionaries for rules to suppress
# Dict1 is keyed by rule number in the hundreds format of # Dict1 is keyed by rule number in the hundreds format of
@ -4074,7 +4075,10 @@ 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:
errmsg = 'misra violation (use --rule-texts=<file> to get proper output)' if self.ruleText_filename is None:
errmsg = 'misra violation (use --rule-texts=<file> to get proper output)'
else:
errmsg = 'misra violation (rule-texts-file not found: ' + self.ruleText_filename + ')'
if self.path_premium_addon: if self.path_premium_addon:
for line in cppcheckdata.cmd_output([self.path_premium_addon, '--cli', '--get-rule-text=' + errorId]).split('\n'): for line in cppcheckdata.cmd_output([self.path_premium_addon, '--cli', '--get-rule-text=' + errorId]).split('\n'):
if len(line) > 1 and not line.startswith('{'): if len(line) > 1 and not line.startswith('{'):
@ -4090,7 +4094,7 @@ class MisraChecker:
# If this is new violation then record it and show it. If not then # If this is new violation then record it and show it. If not then
# skip it since it has already been displayed. # skip it since it has already been displayed.
if not this_violation in self.existing_violations: if this_violation not in self.existing_violations:
self.existing_violations.add(this_violation) self.existing_violations.add(this_violation)
cppcheckdata.reportError(location, cppcheck_severity, errmsg, 'misra', errorId, misra_severity) cppcheckdata.reportError(location, cppcheck_severity, errmsg, 'misra', errorId, misra_severity)
@ -4637,13 +4641,17 @@ def main():
if args.rule_texts: if args.rule_texts:
filename = os.path.expanduser(args.rule_texts) filename = os.path.expanduser(args.rule_texts)
filename = os.path.normpath(filename) filename = os.path.normpath(filename)
if not os.path.isfile(filename): checker.ruleText_filename = filename
print('Fatal error: file is not found: ' + filename) if os.path.isfile(filename):
sys.exit(1) checker.loadRuleTexts(filename)
checker.loadRuleTexts(filename) if args.verify_rule_texts:
if args.verify_rule_texts: checker.verifyRuleTexts()
checker.verifyRuleTexts() sys.exit(0)
sys.exit(0) else:
if args.verify_rule_texts:
print('Fatal error: file is not found: ' + filename)
sys.exit(1)
if args.verify_rule_texts and not args.rule_texts: if args.verify_rule_texts and not args.rule_texts:
print("Error: Please specify rule texts file with --rule-texts=<file>") print("Error: Please specify rule texts file with --rule-texts=<file>")