public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] i915/hangman: Skip if disabled by the kernel
@ 2019-01-10  9:19 Chris Wilson
  2019-01-10  9:43 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2019-01-10  9:19 UTC (permalink / raw)
  To: intel-gfx; +Cc: igt-dev

Some kernels may have to disable error capture for some hardware or by
it being configured out. Since it is conditionally available, asserting
it exists is not an actual requirement. For hardware where we are unable
to provide error state capture, skip.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/hangman.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/i915/hangman.c b/tests/i915/hangman.c
index 6ddae4912..4035f7384 100644
--- a/tests/i915/hangman.c
+++ b/tests/i915/hangman.c
@@ -42,13 +42,16 @@
 static int device = -1;
 static int sysfs = -1;
 
-static void test_sysfs_error_exists(void)
+static bool has_error_state(int dir)
 {
-	char *error;
+	int fd;
 
-	error = igt_sysfs_get(sysfs, "error");
-	igt_assert(error);
-	free(error);
+	fd = openat(dir, "error", O_RDONLY);
+	if (fd < 0)
+		return false;
+
+	close(fd);
+	return true;
 }
 
 static void assert_entry(const char *s, bool expect)
@@ -256,12 +259,12 @@ igt_main
 
 		device = drm_open_driver(DRIVER_INTEL);
 		igt_require_gem(device);
+
 		sysfs = igt_sysfs_open(device, &idx);
 		igt_assert(sysfs != -1);
-	}
 
-	igt_subtest("error-state-sysfs-entry")
-		test_sysfs_error_exists();
+		igt_require(has_error_state(sysfs));
+	}
 
 	igt_subtest("error-state-basic")
 		test_error_state_basic();
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-10 22:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-10  9:19 [igt-dev] [PATCH i-g-t] i915/hangman: Skip if disabled by the kernel Chris Wilson
2019-01-10  9:43 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-01-10 12:27 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-01-10 22:11 ` [igt-dev] [PATCH i-g-t] " Antonio Argenziano

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