[igt-dev] [PATCH i-g-t] scripts/test_list.py: allow adding multiple testlist lines with same name

[Mauro Carvalho Chehab]

From: Mauro Carvalho Chehab <mchehab at kernel.org>

Sometimes, multiple files may contain testlists and blocklists for
the same name.

Add support for it by placing such lists on an array, and storing one
testlist dictionary per line.

Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
---
 scripts/test_list.py             | 13 ++++++++-----
 tests/intel/kms_test_config.json | 22 +++++++++++-----------
 tests/intel/xe_test_config.json  | 12 ++++++------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/scripts/test_list.py b/scripts/test_list.py
index fdc3c1998d23..daca290a02bd 100644
--- a/scripts/test_list.py
+++ b/scripts/test_list.py
@@ -333,16 +333,18 @@ class TestList:
             # Read testlist files if any
             if "testlists" in item["_properties_"]:
                 testlist = {}
-                for name in item["_properties_"]["testlists"].keys():
-                    self.read_testlist(testlist, name, cfg_path + item["_properties_"]["testlists"][name])
+                for value in item["_properties_"]["testlists"]:
+                    for name in value.keys():
+                        self.read_testlist(testlist, name, cfg_path + value[name])
 
                 item["_properties_"]["testlist"] = testlist
 
             # Read blocklist files if any
             if "blocklists" in item["_properties_"]:
                 blocklist = {}
-                for name in item["_properties_"]["blocklists"].keys():
-                    self.read_testlist(blocklist, name, cfg_path + item["_properties_"]["blocklists"][name])
+                for value in item["_properties_"]["blocklists"]:
+                    for name in value.keys():
+                        self.read_testlist(testlist, name, cfg_path + value[name])
 
                 item["_properties_"]["blocklist"] = blocklist
 
@@ -450,7 +452,8 @@ class TestList:
         base = r"^\s*({}[^\s\{}]+)(\S*)\s*(\#.*)?$"
         regex = re.compile(base.format(self.main_name, self.subtest_separator))
 
-        testlist[name] = []
+        if name not in testlist:
+            testlist[name] = []
         with open(filename, 'r', newline = '', encoding = 'utf8') as fp:
             for line in fp:
                 match = regex.match(line)
diff --git a/tests/intel/kms_test_config.json b/tests/intel/kms_test_config.json
index 5be264a79c6e..ad3a3aa7abb5 100644
--- a/tests/intel/kms_test_config.json
+++ b/tests/intel/kms_test_config.json
@@ -23,18 +23,18 @@
                 "_properties_": {
                     "description": "Defines what category of testlist it belongs",
                     "default-testlist": "FULL",
-                    "testlists": {
-                        "i915 BAT": "../intel-ci/fast-feedback.testlist",
-                        "i915 BAT chamelium": "../intel-ci/fast-feedback-chamelium-only.testlist",
-                        "i915 chamelium": "../intel-ci/chamelium-only.testlist",
+                    "testlists": [
+                        { "i915 BAT": "../intel-ci/fast-feedback.testlist" },
+                        { "i915 BAT chamelium": "../intel-ci/fast-feedback-chamelium-only.testlist" },
+                        { "i915 chamelium": "../intel-ci/chamelium-only.testlist" },
 
-                        "Xe BAT": "../intel-ci/xe-fast-feedback.testlist",
-                        "Xe BAT chamelium": "../intel-ci/xe-fast-feedback-chamelium-only.testlist"
-                    },
-                    "blocklists": {
-                        "i915 BAT, i915 BAT chamelium, i915 chamelium": "../intel-ci/blacklist.txt",
-                        "Xe BAT, Xe BAT chamelium": "../intel-ci/xe.blocklist.txt"
-                    }
+                        { "Xe BAT": "../intel-ci/xe-fast-feedback.testlist" },
+                        { "Xe BAT chamelium": "../intel-ci/xe-fast-feedback-chamelium-only.testlist" }
+                    ],
+                    "blocklists": [
+                        { "i915 BAT, i915 BAT chamelium, i915 chamelium": "../intel-ci/blacklist.txt" },
+                        { "Xe BAT, Xe BAT chamelium": "../intel-ci/xe.blocklist.txt" }
+                    ]
                 }
             }
         },
diff --git a/tests/intel/xe_test_config.json b/tests/intel/xe_test_config.json
index 9e582a43df56..89df8a1a3ad2 100644
--- a/tests/intel/xe_test_config.json
+++ b/tests/intel/xe_test_config.json
@@ -33,12 +33,12 @@
                             "mandatory": true,
                             "description": "Defines what category of testlist it belongs",
                             "default-testlist": "FULL",
-                            "testlists": {
-                                "Xe BAT": "../intel-ci/xe-fast-feedback.testlist"
-                            },
-                            "blocklists": {
-                                "Xe BAT": "../intel-ci/xe.blocklist.txt"
-                            },
+                            "testlists": [
+                                { "Xe BAT": "../intel-ci/xe-fast-feedback.testlist" }
+                            ],
+                            "blocklists": [
+                                { "Xe BAT": "../intel-ci/xe.blocklist.txt" }
+                            ],
                             "order": [
                                 "boot",
                                 "__all__",
-- 
2.41.0