public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] i915/gem_exec_capture: Check the strlen() for an empty file
@ 2019-01-29 11:24 Chris Wilson
  2019-01-29 11:56 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2019-01-29 11:24 UTC (permalink / raw)
  To: intel-gfx; +Cc: igt-dev

igt_sysfs_get() only returns NULL if the open() fails, and a valid
string otherwise. So if the read() fails with ENODEV (because sysfs
doesn't provide the driver with an ->open() callback), we return an
empty string, and "No error captured" otherwise.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109481
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/gem_exec_capture.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
index eca73ab11..56837dfca 100644
--- a/tests/i915/gem_exec_capture.c
+++ b/tests/i915/gem_exec_capture.c
@@ -519,6 +519,11 @@ static bool has_capture(int fd)
 	return async > 0;
 }
 
+static size_t safer_strlen(const char *s)
+{
+	return s ? strlen(s) : 0;
+}
+
 igt_main
 {
 	const struct intel_execution_engine *e;
@@ -544,7 +549,7 @@ igt_main
 
 		dir = igt_sysfs_open(fd, NULL);
 		igt_require(igt_sysfs_set(dir, "error", "Begone!"));
-		igt_require(igt_sysfs_get(dir, "error"));
+		igt_require(safer_strlen(igt_sysfs_get(dir, "error")) > 0);
 	}
 
 	for (e = intel_execution_engines; e->name; e++) {
-- 
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-29 23:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-29 11:24 [igt-dev] [PATCH i-g-t] i915/gem_exec_capture: Check the strlen() for an empty file Chris Wilson
2019-01-29 11:56 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-01-29 15:17 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-01-29 23:38 ` [igt-dev] [Intel-gfx] [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