From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0866B10E56E for ; Fri, 5 May 2023 06:11:57 +0000 (UTC) Received: from linux.intel.com (unknown [10.252.18.182]) (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 16790580AB3 for ; Thu, 4 May 2023 23:11:56 -0700 (PDT) Received: from maurocar by linux.intel.com with local (Exim 4.96) (envelope-from ) id 1puofZ-0018gQ-2I for igt-dev@lists.freedesktop.org; Fri, 05 May 2023 08:11:53 +0200 From: Mauro Carvalho Chehab To: igt-dev@lists.freedesktop.org Date: Fri, 5 May 2023 08:11:49 +0200 Message-Id: <20230505061149.271693-1-mauro.chehab@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t] scripts/test_list.py: expand testlist 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 We're about to add support for i915 testlists. On those, it is possible to have functionalities mapped to different buckets, as the same test could be used to test multiple parts of the driver/hardware. So, for instance, the subtest igt@prime_vgem@basic-fence-mmap actually tests two features: - gtt - prime A description of such test will then be mapped as: * SUBTEST: basic-fence-mmap * Description: Examine GTT access path fencing. * Feature: gtt, prime In order to be able to generate per-feature testlists, we need to expand the Feature field, using the separator field (currently a comma) to expand the test lists. Signed-off-by: Mauro Carvalho Chehab --- scripts/test_list.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/test_list.py b/scripts/test_list.py index a0db07125bc4..c9dbf144da1e 100755 --- a/scripts/test_list.py +++ b/scripts/test_list.py @@ -772,7 +772,7 @@ class TestList: # Subtest list methods # - def get_subtests(self, sort_field = None): + def get_subtests(self, sort_field = None, expand = None): """Return an array with all subtests""" @@ -799,10 +799,17 @@ class TestList: if sort_field: if sort_field in subtest: - if subtest[sort_field] not in subtests: - subtests[subtest[sort_field]] = [] - - subtests[subtest[sort_field]].append(subtest["Summary"]) + if expand: + test_list = subtest[sort_field].split(expand) + for test_elem in test_list: + test_elem = test_elem.strip() + if test_elem not in subtests: + subtests[test_elem] = [] + subtests[test_elem].append(subtest["Summary"]) + else: + if subtest[sort_field] not in subtests: + subtests[subtest[sort_field]] = [] + subtests[subtest[sort_field]].append(subtest["Summary"]) else: subtests[""].append(subtest["Summary"]) @@ -1142,7 +1149,8 @@ class TestList: test_prefix = os.path.commonprefix(self.get_subtests()[""]) test_prefix = re.sub(r'^igt@', '', test_prefix) - test_subtests = self.get_subtests(sort_field) + # NOTE: currently, it uses a comma for multi-value delimitter + test_subtests = self.get_subtests(sort_field, ",") for test in test_subtests.keys(): # pylint: disable=C0201,C0206 if not test_subtests[test]: -- 2.40.1