Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH 1/3] runner: Normalize testlist entries that don't list subtests
@ 2023-10-20 13:30 Petri Latvala
  2023-10-20 13:30 ` [igt-dev] [PATCH 2/3] runner/runner_tests: Unit tests for binary-name-only testlist entries Petri Latvala
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Petri Latvala @ 2023-10-20 13:30 UTC (permalink / raw)
  To: igt-dev

As the syntax for "all subtests" and "test that doesn't have subtests"
is the same, check the subtest listing when building the execution
plan. Doing that makes it possible to still have "all subtests" in
testlists (albeit not originally designed to support that) and enables
blocklisting particular subtests.

Signed-off-by: Petri Latvala <adrinael@adrinael.net>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Arkadiusz Hiler <arek@hiler.eu>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Cc: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/149
---
 runner/job_list.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/runner/job_list.c b/runner/job_list.c
index e6ea83631..27cbb10bc 100644
--- a/runner/job_list.c
+++ b/runner/job_list.c
@@ -230,8 +230,28 @@ static bool job_list_from_test_list(struct job_list *job_list,
 			continue;
 
 		if (sscanf(line, "igt@%ms", &binary) == 1) {
-			if ((delim = strchr(binary, '@')) != NULL)
+			if ((delim = strchr(binary, '@')) != NULL) {
 				*delim++ = '\0';
+			} else {
+				/*
+				 * No subtests specified. Check
+				 * whether the user means "all
+				 * subtests" or if the test doesn't
+				 * have any.
+				 */
+				if (entry.binary) {
+					/* First flush the entry we're building for multiple-mode */
+					add_job_list_entry(job_list, entry.binary, entry.subtests, entry.subtest_count);
+					memset(&entry, 0, sizeof(entry));
+					any = true;
+				}
+
+				add_subtests(job_list, settings, binary,
+					     &settings->include_regexes,
+					     &settings->exclude_regexes);
+				any = true;
+				continue;
+			}
 
 			if (!settings->multiple_mode) {
 				char **subtests = NULL;
-- 
2.39.2

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2023-10-24 16:54 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-20 13:30 [igt-dev] [PATCH 1/3] runner: Normalize testlist entries that don't list subtests Petri Latvala
2023-10-20 13:30 ` [igt-dev] [PATCH 2/3] runner/runner_tests: Unit tests for binary-name-only testlist entries Petri Latvala
2023-10-24 13:57   ` Mauro Carvalho Chehab
2023-10-24 16:53   ` Kamil Konieczny
2023-10-20 13:30 ` [igt-dev] [PATCH 3/3] runner/runner_tests: Fix name of no-subtests in unit tests Petri Latvala
2023-10-24 13:58   ` Mauro Carvalho Chehab
2023-10-24  1:01 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [1/3] runner: Normalize testlist entries that don't list subtests Patchwork
2023-10-24  1:56 ` [igt-dev] ✓ CI.xeBAT: " Patchwork
2023-10-24 13:51 ` [igt-dev] [PATCH 1/3] " Mauro Carvalho Chehab

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox