[PATCH i-g-t 5/8] scripts/igt_doc.py: better handle default gpu
Mauro Carvalho Chehab
mauro.chehab at linux.intel.com
Fri Feb 9 11:17:03 UTC 2024
From: Mauro Carvalho Chehab <mchehab at kernel.org>
The variable "gpu" is used on several loops inside
gen_intelci_testlist(). That's confusing and error-pruned.
Instead, use "default_gpu" for the one used only for
default values.
Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
---
scripts/igt_doc.py | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/scripts/igt_doc.py b/scripts/igt_doc.py
index 1c2c7a8ef973..fd1960dac6e0 100755
--- a/scripts/igt_doc.py
+++ b/scripts/igt_doc.py
@@ -107,6 +107,7 @@ class IgtTestList(TestList):
# Create a testlist dictionary
testlists = {}
+ default_gpu = "default"
for driver, run_types in tests_per_list.items():
testlists[driver] = {}
@@ -120,18 +121,15 @@ class IgtTestList(TestList):
if "all" in tests_per_list[driver][run_type][subname]:
continue
- if not gpu_set:
- gpu = "default"
-
# Trivial case: fields not defined: add subtest
if not gpu_set:
- if gpu not in testlists[driver]:
- testlists[driver][gpu] = {}
+ if default_gpu not in testlists[driver]:
+ testlists[driver][default_gpu] = {}
- if run_type not in testlists[driver][gpu]:
- testlists[driver][gpu][run_type] = set()
+ if run_type not in testlists[driver][default_gpu]:
+ testlists[driver][default_gpu][run_type] = set()
- testlists[driver][gpu][run_type].add(subname)
+ testlists[driver][default_gpu][run_type].add(subname)
continue
if not gpus:
@@ -173,7 +171,16 @@ class IgtTestList(TestList):
testlists[driver][gpu][run_type].add(subname)
if default_gpu_value:
- testlists[driver][gpu][run_type].add(subname)
+ if default_gpu not in testlists[driver]:
+ testlists[driver][default_gpu] = {}
+
+ if run_type not in testlists[driver][default_gpu]:
+ testlists[driver][default_gpu][run_type] = set()
+
+ testlists[driver][default_gpu][run_type].add(subname)
+
+ if len(gpu_set) == 0:
+ gpu_set.add(default_gpu)
return (testlists, gpu_set)
--
2.43.0
More information about the igt-dev
mailing list