From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB92710E6A5 for ; Thu, 31 Aug 2023 14:55:19 +0000 (UTC) Received: from linux.intel.com (unknown [10.252.5.209]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id F2AC6580EA6 for ; Thu, 31 Aug 2023 07:55:14 -0700 (PDT) Received: from maurocar by linux.intel.com with local (Exim 4.96) (envelope-from ) id 1qbj4i-0020HJ-2u for igt-dev@lists.freedesktop.org; Thu, 31 Aug 2023 16:55:12 +0200 From: Mauro Carvalho Chehab To: igt-dev@lists.freedesktop.org Date: Thu, 31 Aug 2023 16:52:09 +0200 Message-ID: <20230831145509.477543-8-mauro.chehab@linux.intel.com> In-Reply-To: <20230831145509.477543-1-mauro.chehab@linux.intel.com> References: <20230831145509.477543-1-mauro.chehab@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t v4 07/11] scripts/test_list.py: skip some internal fields List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: Mauro Carvalho Chehab both subtest_line and _summary_ are used internally at the script logic. They shouldn't be part of the output. Signed-off-by: Mauro Carvalho Chehab --- scripts/test_list.py | 68 +++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 35 deletions(-) mode change 100755 => 100644 scripts/test_list.py diff --git a/scripts/test_list.py b/scripts/test_list.py old mode 100755 new mode 100644 index 753ec91206cd..e5bf24f9b5ef --- a/scripts/test_list.py +++ b/scripts/test_list.py @@ -264,6 +264,8 @@ class TestList: self.subtest_separator = subtest_separator self.main_name = main_name + self.internal_fields = [ '_summary_', '_arg_', '_subtest_line_' ] + if self.main_name: self.main_name += subtest_separator @@ -436,7 +438,7 @@ class TestList: continue num_vars = summary.count('%') - file_ln = self.doc[test]["subtest_line"][subtest] + file_ln = self.doc[test]["_subtest_line_"][subtest] # Handle trivial case: no wildcards if num_vars == 0: @@ -445,7 +447,7 @@ class TestList: subtest_dict["_summary_"] = summary for k in sorted(self.doc[test]["subtest"][subtest].keys()): - if k in [ '_summary_', 'arg', 'subtest_line' ]: + if k in self.internal_fields: continue if not allow_inherit: @@ -468,14 +470,14 @@ class TestList: # Convert subtest arguments into an array arg_array = {} - arg_ref = self.doc[test]["subtest"][subtest]["arg"] + arg_ref = self.doc[test]["subtest"][subtest]["_arg_"] - for arg_k in self.doc[test]["arg"][arg_ref].keys(): + for arg_k in self.doc[test]["_arg_"][arg_ref].keys(): arg_array[arg_k] = [] if int(arg_k) > num_vars: continue - for arg_el in sorted(self.doc[test]["arg"][arg_ref][arg_k].keys()): + for arg_el in sorted(self.doc[test]["_arg_"][arg_ref][arg_k].keys()): arg_array[arg_k].append(arg_el) size = len(arg_array) @@ -500,9 +502,9 @@ class TestList: arg_val = arg_array[j][pos[j]] args[j] = arg_val - if arg_val in self.doc[test]["arg"][arg_ref][j]: - arg_map[j] = self.doc[test]["arg"][arg_ref][j][arg_val] - if re.match(r"\<.*\>", self.doc[test]["arg"][arg_ref][j][arg_val]): + if arg_val in self.doc[test]["_arg_"][arg_ref][j]: + arg_map[j] = self.doc[test]["_arg_"][arg_ref][j][arg_val] + if re.match(r"\<.*\>", self.doc[test]["_arg_"][arg_ref][j][arg_val]): args[j] = "<" + arg_val + ">" else: arg_map[j] = arg_val @@ -514,7 +516,7 @@ class TestList: subtest_dict["_summary_"] = arg_summary for field in sorted(self.doc[test]["subtest"][subtest].keys()): - if field in [ '_summary_', 'arg', 'subtest_line' ]: + if field in self.internal_fields: continue sub_field = self.doc[test]["subtest"][subtest][field] @@ -567,9 +569,7 @@ class TestList: test_dict[name] = {} for field in self.doc[test]: - if field == "subtest": - continue - if field == "arg": + if field in self.internal_fields: continue test_dict[name][field] = self.doc[test][field] @@ -586,7 +586,7 @@ class TestList: dic[summary] = {} for field in sorted(subtest.keys()): - if field in [ '_summary_', 'arg', 'subtest_line' ]: + if field in self.internal_fields: continue dic[summary][field] = subtest[field] @@ -639,7 +639,7 @@ class TestList: for field in sorted(self.doc[test].keys()): if field == "subtest": continue - if field == "arg": + if field in self.internal_fields: continue print(f":{field}: {self.doc[test][field]}") @@ -652,7 +652,7 @@ class TestList: print("") for field in sorted(subtest.keys()): - if field in [ '_summary_', 'arg', 'subtest_line' ]: + if field in self.internal_fields: continue print(f":{field}:", subtest[field]) @@ -1078,11 +1078,11 @@ class TestList: handle_section = 'test' self.doc[current_test] = {} - self.doc[current_test]["arg"] = {} + self.doc[current_test]["_arg_"] = {} self.doc[current_test]["_summary_"] = match.group(1) self.doc[current_test]["File"] = fname self.doc[current_test]["subtest"] = {} - self.doc[current_test]["subtest_line"] = {} + self.doc[current_test]["_subtest_line_"] = {} if implemented_class: self.doc[current_test]["Class"] = implemented_class @@ -1103,9 +1103,7 @@ class TestList: # subtests inherit properties from the tests self.doc[current_test]["subtest"][current_subtest] = {} for field in self.doc[current_test].keys(): - if field == "arg": - continue - if field == "summary": + if field in self.internal_fields: continue if field == "File": continue @@ -1119,14 +1117,14 @@ class TestList: self.doc[current_test]["subtest"][current_subtest]["_summary_"] = match.group(1) self.doc[current_test]["subtest"][current_subtest]["Description"] = '' - self.doc[current_test]["subtest_line"][current_subtest] = file_ln + self.doc[current_test]["_subtest_line_"][current_subtest] = file_ln if not arg_ref: arg_ref = arg_number arg_number += 1 - self.doc[current_test]["arg"][arg_ref] = {} + self.doc[current_test]["_arg_"][arg_ref] = {} - self.doc[current_test]["subtest"][current_subtest]["arg"] = arg_ref + self.doc[current_test]["subtest"][current_subtest]["_arg_"] = arg_ref continue @@ -1156,14 +1154,14 @@ class TestList: sys.exit(f"{fname}:{file_ln + 1}: arguments should be defined after one or more subtests, at the same comment") cur_arg = int(match.group(1)) - 1 - if cur_arg not in self.doc[current_test]["arg"][arg_ref]: - self.doc[current_test]["arg"][arg_ref][cur_arg] = {} + if cur_arg not in self.doc[current_test]["_arg_"][arg_ref]: + self.doc[current_test]["_arg_"][arg_ref][cur_arg] = {} cur_arg_element = match.group(2) if match.group(2): # Should be used only for numeric values - self.doc[current_test]["arg"][arg_ref][cur_arg][cur_arg_element] = "<" + match.group(2) + ">" + self.doc[current_test]["_arg_"][arg_ref][cur_arg][cur_arg_element] = "<" + match.group(2) + ">" continue @@ -1175,7 +1173,7 @@ class TestList: sys.exit(f"{fname}:{file_ln + 1}: arguments should be defined after one or more subtests, at the same comment") cur_arg_element = match.group(1) - self.doc[current_test]["arg"][arg_ref][cur_arg][cur_arg_element] = match.group(2) + self.doc[current_test]["_arg_"][arg_ref][cur_arg][cur_arg_element] = match.group(2) else: print(f"{fname}:{file_ln + 1}: Warning: invalid argument: @%s: %s" % @@ -1188,14 +1186,14 @@ class TestList: if match: cur_arg = int(match.group(1)) - 1 - if cur_arg not in self.doc[current_test]["arg"][arg_ref]: - self.doc[current_test]["arg"][arg_ref][cur_arg] = {} + if cur_arg not in self.doc[current_test]["_arg_"][arg_ref]: + self.doc[current_test]["_arg_"][arg_ref][cur_arg] = {} values = match.group(2).replace(" ", "").split(",") for split_val in values: if split_val == "": continue - self.doc[current_test]["arg"][arg_ref][cur_arg][split_val] = split_val + self.doc[current_test]["_arg_"][arg_ref][cur_arg][split_val] = split_val continue @@ -1219,13 +1217,13 @@ class TestList: if match: match_val = match.group(1) - match = re.match(r'^(\<.*)\>$',self.doc[current_test]["arg"][arg_ref][cur_arg][cur_arg_element]) + match = re.match(r'^(\<.*)\>$',self.doc[current_test]["_arg_"][arg_ref][cur_arg][cur_arg_element]) if match: - self.doc[current_test]["arg"][arg_ref][cur_arg][cur_arg_element] = match.group(1) + ' ' + match_val + ">" + self.doc[current_test]["_arg_"][arg_ref][cur_arg][cur_arg_element] = match.group(1) + ' ' + match_val + ">" else: - if self.doc[current_test]["arg"][arg_ref][cur_arg][cur_arg_element] != '': - self.doc[current_test]["arg"][arg_ref][cur_arg][cur_arg_element] += ' ' - self.doc[current_test]["arg"][arg_ref][cur_arg][cur_arg_element] += match_val + if self.doc[current_test]["_arg_"][arg_ref][cur_arg][cur_arg_element] != '': + self.doc[current_test]["_arg_"][arg_ref][cur_arg][cur_arg_element] += ' ' + self.doc[current_test]["_arg_"][arg_ref][cur_arg][cur_arg_element] += match_val continue file_line.rstrip(r"\n") -- 2.41.0