Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: tomasz.mistat@intel.com, jari.tahvanainen@intel.com
Subject: [igt-dev] [PATCH i-g-t v3 6/7] scripts/test_list.py: move "FULL" testlist to config file
Date: Thu,  7 Sep 2023 12:17:37 +0200	[thread overview]
Message-ID: <20230907101852.522819-7-mauro.chehab@linux.intel.com> (raw)
In-Reply-To: <20230907101852.522819-1-mauro.chehab@linux.intel.com>

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

Don't assume that the default testlist is "FULL". Instead, read
it from the configuration file.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 scripts/test_list.py             | 6 ++++--
 tests/intel/kms_test_config.json | 1 +
 tests/intel/xe_test_config.json  | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/test_list.py b/scripts/test_list.py
index c1518a904baf..bd03fcfc7efd 100644
--- a/scripts/test_list.py
+++ b/scripts/test_list.py
@@ -484,6 +484,8 @@ class TestList:
             if "testlist" not in self.props[field]["_properties_"]:
                 continue
 
+            default_value = self.props[field]["_properties_"].get("default-testlist")
+
             testname = subtest_dict["_summary_"]
 
             value = subtest_dict.get(field)
@@ -510,8 +512,8 @@ class TestList:
                                 set_full_if_empty = False
                             values.discard(deleted_names)
 
-            if set_full_if_empty and not values:
-                values = set(["FULL"])
+            if default_value and set_full_if_empty and not values:
+                values = set([default_value])
 
             subtest_dict[field] = ", ".join(sorted(values))
 
diff --git a/tests/intel/kms_test_config.json b/tests/intel/kms_test_config.json
index 7ab288685677..5be264a79c6e 100644
--- a/tests/intel/kms_test_config.json
+++ b/tests/intel/kms_test_config.json
@@ -22,6 +22,7 @@
             "Run type": {
                 "_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",
diff --git a/tests/intel/xe_test_config.json b/tests/intel/xe_test_config.json
index 408afcbb03bc..9e582a43df56 100644
--- a/tests/intel/xe_test_config.json
+++ b/tests/intel/xe_test_config.json
@@ -32,6 +32,7 @@
                         "_properties_": {
                             "mandatory": true,
                             "description": "Defines what category of testlist it belongs",
+                            "default-testlist": "FULL",
                             "testlists": {
                                 "Xe BAT": "../intel-ci/xe-fast-feedback.testlist"
                             },
-- 
2.41.0

  parent reply	other threads:[~2023-09-07 10:19 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-07 10:17 [igt-dev] [PATCH i-g-t v3 0/7] Xe: set Run type from testlist instead of defining it Mauro Carvalho Chehab
2023-09-07 10:17 ` [igt-dev] [PATCH i-g-t v3 1/7] test_list.py: add support for reading testlist regular expressions Mauro Carvalho Chehab
2023-09-07 12:19   ` Kamil Konieczny
2023-09-08  8:14     ` Mauro Carvalho Chehab
2023-09-07 10:17 ` [igt-dev] [PATCH i-g-t v3 2/7] xe_test_config.json: add testlists and blocklists Mauro Carvalho Chehab
2023-09-07 12:39   ` Kamil Konieczny
2023-09-07 10:17 ` [igt-dev] [PATCH i-g-t v3 3/7] kms_test_config.json: " Mauro Carvalho Chehab
2023-09-07 12:42   ` Kamil Konieczny
2023-09-07 10:17 ` [igt-dev] [PATCH i-g-t v3 4/7] tests: Intel Xe: drop Run type field Mauro Carvalho Chehab
2023-09-07 10:17 ` [igt-dev] [PATCH i-g-t v3 5/7] tests: Intel KMS: " Mauro Carvalho Chehab
2023-09-07 12:47   ` Kamil Konieczny
2023-09-07 10:17 ` Mauro Carvalho Chehab [this message]
2023-09-07 13:09   ` [igt-dev] [PATCH i-g-t v3 6/7] scripts/test_list.py: move "FULL" testlist to config file Kamil Konieczny
2023-09-08  8:20     ` Mauro Carvalho Chehab
2023-09-07 10:17 ` [igt-dev] [PATCH i-g-t v3 7/7] scripts/test_list.py: don't be greedy while matching data from testlists Mauro Carvalho Chehab
2023-09-07 11:21 ` [igt-dev] ✗ Fi.CI.BAT: failure for Xe: set Run type from testlist instead of defining it Patchwork
2023-09-07 11:53 ` [igt-dev] ✓ CI.xeBAT: success " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230907101852.522819-7-mauro.chehab@linux.intel.com \
    --to=mauro.chehab@linux.intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=jari.tahvanainen@intel.com \
    --cc=tomasz.mistat@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox