[igt-dev] [PATCH i-g-t 3/5] intel/*.json: better handle FULL testlist

Mauro Carvalho Chehab mauro.chehab at linux.intel.com
Thu Nov 2 13:06:25 UTC 2023


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

On KMS, the FULL testlist for i915 and Xe may be different, as they
have different blocklists.

Rename FULL to Xe FULL or i915 FULL, accordingly.

Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
---
 tests/intel/kms_test_config.json | 6 +++---
 tests/intel/xe_test_config.json  | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/intel/kms_test_config.json b/tests/intel/kms_test_config.json
index 53465c534bdc..e94737981ab7 100644
--- a/tests/intel/kms_test_config.json
+++ b/tests/intel/kms_test_config.json
@@ -23,7 +23,7 @@
                 "_properties_": {
                     "description": "Defines what category of testlist it belongs",
                     "update-from-file": {
-                        "append-value-if-not-excluded": "FULL",
+                        "append-value-if-not-excluded": "Xe FULL, i915 FULL",
                         "match-type": "subtest-match",
                         "include": [
                             { "i915 BAT": "../intel-ci/fast-feedback.testlist" },
@@ -34,8 +34,8 @@
                             { "Xe BAT chamelium": "../intel-ci/xe-fast-feedback-chamelium-only.testlist" }
                         ],
                         "exclude": [
-                            { "i915 BAT, i915 BAT chamelium, i915 chamelium, FULL": "../intel-ci/blacklist.txt" },
-                            { "Xe BAT, Xe BAT chamelium, FULL": "../intel-ci/xe.blocklist.txt" }
+                            { "i915 BAT, i915 BAT chamelium, i915 chamelium, i915 FULL": "../intel-ci/blacklist.txt" },
+                            { "Xe BAT, Xe BAT chamelium, Xe FULL": "../intel-ci/xe.blocklist.txt" }
                         ]
                     }
                 }
diff --git a/tests/intel/xe_test_config.json b/tests/intel/xe_test_config.json
index 6c8059b6f21f..44c3dd4b4fee 100644
--- a/tests/intel/xe_test_config.json
+++ b/tests/intel/xe_test_config.json
@@ -35,12 +35,13 @@
                             "default-testlist": "FULL",
                             "update-from-file": {
                                 "type": "subtest-match",
+                                "append-value-if-not-excluded": "Xe FULL",
                                 "include": [
                                     { "Xe BAT": "../intel-ci/xe-fast-feedback.testlist" }
                                 ],
                                 "exclude": [
-                                    { "Xe BAT": "../intel-ci/xe.blocklist.txt" }
-                                ],
+                                    { "Xe BAT, Xe FULL": "../intel-ci/xe.blocklist.txt" }
+                                ]
                             },
                             "order": [
                                 "boot",
-- 
2.41.0



More information about the igt-dev mailing list