From 9b807ba047538bdc88a1e09c01b27e024d060b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Thu, 5 May 2022 14:15:09 +0200 Subject: [PATCH] misra: fix problems when executing premium addon --- addons/cppcheckdata.py | 4 +++- addons/misra.py | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/cppcheckdata.py b/addons/cppcheckdata.py index b954ee560..f56081923 100755 --- a/addons/cppcheckdata.py +++ b/addons/cppcheckdata.py @@ -10,6 +10,8 @@ import argparse import json import os import sys +import subprocess + try: import pathlib except ImportError: @@ -1390,6 +1392,6 @@ def get_path_premium_addon(): def cmd_output(cmd): try: - return subprocess.check_output([self.path_premium_addon, '--cli', '--get-rule-text=' + errorId]).strip().decode('ascii') + return subprocess.check_output(cmd).strip().decode('ascii') except subprocess.CalledProcessError as e: return e.output diff --git a/addons/misra.py b/addons/misra.py index 2c266e5ba..c4136afbf 100755 --- a/addons/misra.py +++ b/addons/misra.py @@ -25,7 +25,6 @@ import argparse import codecs import string import copy -import subprocess try: from itertools import izip as zip @@ -4400,7 +4399,7 @@ class MisraChecker: # Premium MISRA checking, deep analysis if cfgNumber == 0 and self.path_premium_addon: - subprocess.cmd_output([self.path_premium_addon, '--cli', '--misra', dumpfile]) + cppcheckdata.cmd_output([self.path_premium_addon, '--cli', '--misra', dumpfile]) def analyse_ctu_info(self, ctu_info_files): all_typedef_info = [] @@ -4665,7 +4664,7 @@ def main(): premium_command = [checker.path_premium_addon, '--misra', '--file-list', args.file_list] if args.cli: premium_command.append('--cli') - for line in subprocess.cmd_output(premium_command).split('\n'): + for line in cppcheckdata.cmd_output(premium_command).split('\n'): if re.search(r'"errorId".*:.*"misra-', line) is not None: print(line.strip())