From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1565DC4829F for ; Fri, 9 Feb 2024 11:19:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 94CBE10F334; Fri, 9 Feb 2024 11:19:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="LX+qGuXd"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 23BCD10EB3D for ; Fri, 9 Feb 2024 11:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707477577; x=1739013577; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding:sender; bh=gm0COISMDWV5C8TVXeh8Fa5CuZJ4dgV/QuJRzv9TecA=; b=LX+qGuXdAKWw2NnKXnKewoc3ZokgKcbHgBhrETWPvZ6+2MCK4APE8LWZ ZJxWxnEKDH7btSN2Vf4x7xvMr6Aw7XYhakP8lo8LKNgiZpfPnrs6TSD4B Q2+Ksqpt7ext0sk89gXNJm8jNsL9nTQwKg5/qJr+h+gHCmxN7ZgewizJ6 j3dAafeJyhuZVE0Np9D6G+0hsDcIuOyFwnXfjhgadI46faOffBasTyqN0 6voGjM1ZqGP0WJbxzV/4aocP//cQOfM2cEaidW7eOYwmamPqYLDfim3pW 61ltXXo2s/B4vDwjyVNs4iLPr/7BZgodG1RyzY0qv17EQ6Odvh4cOcEcP A==; X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="11984189" X-IronPort-AV: E=Sophos;i="6.05,256,1701158400"; d="scan'208";a="11984189" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 03:19:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,256,1701158400"; d="scan'208";a="1908154" Received: from linux.intel.com ([10.54.29.200]) by fmviesa010.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 03:19:31 -0800 Received: from linux.intel.com (maurocar-mobl2.ger.corp.intel.com [10.245.246.44]) (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 8371B580E62 for ; Fri, 9 Feb 2024 03:19:30 -0800 (PST) Received: from maurocar by linux.intel.com with local (Exim 4.97.1) (envelope-from ) id 1rYOum-000000018jD-1X6K for igt-dev@lists.freedesktop.org; Fri, 09 Feb 2024 12:19:28 +0100 From: Mauro Carvalho Chehab To: igt-dev@lists.freedesktop.org Subject: [PATCH i-g-t 8/8] scripts/igt_doc.py: simplify and cleanup tests_per_list logic Date: Fri, 9 Feb 2024 12:17:06 +0100 Message-ID: <20240209111925.271717-9-mauro.chehab@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209111925.271717-1-mauro.chehab@linux.intel.com> References: <20240209111925.271717-1-mauro.chehab@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" From: Mauro Carvalho Chehab Re-do the logic which calculates tests_per_list dict inside gen_intelci_testlist(): - better handle "other" runtype; - better handle driver name discovery logic. Signed-off-by: Mauro Carvalho Chehab --- scripts/igt_doc.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/scripts/igt_doc.py b/scripts/igt_doc.py index bf51e5f4ebb3..1b4f7eafd135 100755 --- a/scripts/igt_doc.py +++ b/scripts/igt_doc.py @@ -61,36 +61,35 @@ class IgtTestList(TestList): split_regex = re.compile(r",\s*") for subname, subtest in subtest_dict.items(): - run_types = subtest.get("Run type", "other") - run_type_set = set(split_regex.split(run_types)) - + run_types = subtest.get("Run type", "other").lower() + drivers = set() run_type_set = set() for run_type in set(split_regex.split(run_types)): - run_type = run_type.lower() - - drivers = set(self.drivers) for driver in self.drivers: - driver = driver.lower() - if run_type.startswith(driver): run_type = re.sub(r"^" + driver + r"[\W_]*", "", run_type) drivers = set([driver]) break + if not drivers: + drivers.update(self.drivers) + + if not run_type: + run_type = "other" + run_type_set.add(run_type) + if not drivers: + drivers = set(self.drivers) + for driver in drivers: if driver not in tests_per_list: tests_per_list[driver] = {} for run_type in run_type_set: - if not run_type: - run_type = "other" - if run_type not in tests_per_list[driver]: tests_per_list[driver][run_type] = {} - if subname not in tests_per_list[driver][run_type]: tests_per_list[driver][run_type][subname] = {} -- 2.43.0