diff mbox

[igt] tests/kms_fbc_crc: fix debugfs read

Message ID 1430856101-1825-1-git-send-email-przanoni@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paulo Zanoni May 5, 2015, 8:01 p.m. UTC 
From: Paulo Zanoni <paulo.r.zanoni@intel.com>

Commit 47f6b1305cc3752f318a555b932e194e1500c1d8 completely broke this
test due to the fread() assertion. When we're reading the debugfs file
we really don't care about how many bytes we read because the number
is not constant and we just use strstr() later. Change the assertion
to make it check for at least 1 byte read, just to make sure no one
changes that again.

Regression introduced by:
commit 47f6b1305cc3752f318a555b932e194e1500c1d8
Author: Thomas Wood <thomas.wood@intel.com>
Date:   Wed Mar 25 16:42:57 2015 +0000
    igt.cocci: check the return values of various functions

Cc: Thomas Wood <thomas.wood@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 tests/kms_fbc_crc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

We might also want to change/fix lib/igt.cocci, but I'll leave that to Thomas.
There are other cases where we just read debugfs and we don't really care about
how many bytes we actually read.
diff mbox

Patch

diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
index 1320bad..3fd870d 100644
--- a/tests/kms_fbc_crc.c
+++ b/tests/kms_fbc_crc.c
@@ -198,7 +198,7 @@  static bool fbc_enabled(data_t *data)
 	status = igt_debugfs_fopen("i915_fbc_status", "r");
 	igt_assert(status);
 
-	igt_assert_eq(fread(str, sizeof(str) - 1, 1, status), 1);
+	igt_assert(fread(str, 1, sizeof(str) - 1, status) > 0);
 	fclose(status);
 	return strstr(str, "FBC enabled") != NULL;
 }