Skip to contentSkip to conversation

tests/intel/xe_eudebug: move multigpu requirement to test block

PATCH In review Jan Sokolowski 3 participants 3 messages Jun 27, 2025 – Jun 30, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/intel/xe_eudebug: move multigpu requirement to test block

As test fixtures are called regardless whether an associated test is going to be executed or not, calling eg. ./xe_eudebug --run basic-connect
would execute
igt_require(gpu_count >= 2);
from later in the igt_main function, despite it being unnecessary and printing a misleading and unrelated requirements check when ran on single gpu host.

Move igt_require(gpu_count >= 2) from fixture block to test block.

Cc Katarzyna Piecielska <[email protected]>
Cc Kamil Konieczny <[email protected]>
---
 tests/intel/xe_eudebug.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tests/intel/xe_eudebug.c +2 -1
index bdf73c4e9..d2a1932fb 100644
@@ -2923,7 +2923,6 @@ igt_main
 	igt_subtest_group {
 		igt_fixture {
 			gpu_count = drm_prepare_filtered_multigpu(DRIVER_XE);
-			igt_require(gpu_count >= 2);
 
 			multigpu_was_enabled = malloc(gpu_count * sizeof(bool));
 			igt_assert(multigpu_was_enabled);
@@ -2935,6 +2934,7 @@ igt_main
 		}
 
 		igt_subtest("multigpu-basic-client") {
+			igt_require(gpu_count >= 2);
 			igt_multi_fork(child, gpu_count) {
 				fd = drm_open_filtered_card(child);
 				igt_assert_f(fd > 0, "cannot open gpu-%d, errno=%d\n",
@@ -2948,6 +2948,7 @@ igt_main
 		}
 
 		igt_subtest("multigpu-basic-client-many") {
+			igt_require(gpu_count >= 2);
 			igt_multi_fork(child, gpu_count) {
 				fd = drm_open_filtered_card(child);
 				igt_assert_f(fd > 0, "cannot open gpu-%d, errno=%d\n",
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw

LGTM,

Quoted 64 lines

-----Original Message-----
From: igt-dev <[email protected]> On Behalf Of Jan Sokolowski
Sent: Friday, June 27, 2025 9:42 AM
To: [email protected]
Cc: Sokolowski, Jan <[email protected]>; Piecielska, Katarzyna <[email protected]>; Kamil Konieczny <[email protected]>
Subject: [PATCH i-g-t v1 1/1] tests/intel/xe_eudebug: move multigpu requirement to test block

As test fixtures are called regardless whether an associated test is going to be executed or not, calling eg. ./xe_eudebug --run basic-connect
would execute
igt_require(gpu_count >= 2);
from later in the igt_main function, despite it being unnecessary and printing a misleading and unrelated requirements check when ran on single gpu host.

Move igt_require(gpu_count >= 2) from fixture block to test block.

Cc Katarzyna Piecielska <[email protected]>
Cc Kamil Konieczny <[email protected]>
---
 tests/intel/xe_eudebug.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tests/intel/xe_eudebug.c +0 -1
index bdf73c4e9..d2a1932fb 100644
@@ -2923,7 +2923,6 @@ igt_main
 	igt_subtest_group {
 		igt_fixture {
 			gpu_count =
 drm_prepare_filtered_multigpu(DRIVER_XE);
-			igt_require(gpu_count >= 2);
 
 			multigpu_was_enabled = malloc(gpu_count *

sizeof(bool));

tests/intel/xe_eudebug.c +1 -0
 			igt_assert(multigpu_was_enabled);
@@ -2935,6 +2934,7 @@ igt_main
 		}
 
 		igt_subtest("multigpu-basic-client") {
+			igt_require(gpu_count >= 2);
 			igt_multi_fork(child, gpu_count) {
 				fd = drm_open_filtered_card(child);
 				igt_assert_f(fd > 0, "cannot open gpu-%d,

errno=%d\n",

tests/intel/xe_eudebug.c +1 -0
@@ -2948,6 +2948,7 @@ igt_main
 		}
 
 		igt_subtest("multigpu-basic-client-many") {
+			igt_require(gpu_count >= 2);
 			igt_multi_fork(child, gpu_count) {
 				fd = drm_open_filtered_card(child);
 				igt_assert_f(fd > 0, "cannot open gpu-%d,

errno=%d\n",
--
2.34.1

#2 lore raw

✗ Fi.CI.BAT: failure for series starting with [i-g-t,v1,1/1] tests/intel/xe_eudebug: move multigpu requirement to test block

In reply to Jan Sokolowski
== Series Details ==

== Series Details ==

Series: series starting with [i-g-t,v1,1/1] tests/intel/xe_eudebug: move multigpu requirement to test block
URL : https://patchwork.freedesktop.org/series/150855/
State : failure

== Summary ==

Series 150855 revision 1 was fully merged or fully failed: no git log