summaryrefslogtreecommitdiff
path: root/tests/i915/i915_hangman.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2019-07-28 10:08:00 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2019-10-15 14:52:18 +0100
commit1a644320e76f6d7cb13462804b5a8897c9b7d057 (patch)
tree5a5854a7e506a23d5509fa92bf3993d4b666d310 /tests/i915/i915_hangman.c
parent93f306e43c946ba0748c5ed0e4549ead52b870a6 (diff)
i915_hangman: Force error capture
For fast preempt-resets, error capture is skipped, so disable preempt-resets before checking the error state. While thinking ahead, be prepared for when the modparams are not accessible. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Diffstat (limited to 'tests/i915/i915_hangman.c')
-rw-r--r--tests/i915/i915_hangman.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c
index 58141fc9..7a158d8d 100644
--- a/tests/i915/i915_hangman.c
+++ b/tests/i915/i915_hangman.c
@@ -140,12 +140,13 @@ static void check_error_state(const char *expected_ring_name,
size_t line_size = 0;
bool found = false;
- igt_debug("%s(expected ring name=%s, expected offset=%"PRIx64")\n",
- __func__, expected_ring_name, expected_offset);
igt_debugfs_dump(device, "i915_error_state");
igt_assert(getline(&line, &line_size, file) != -1);
- igt_assert(strcasecmp(line, "No error state collected"));
+ igt_require(strcasecmp(line, "No error state collected"));
+
+ igt_debug("%s(expected ring name=%s, expected offset=%"PRIx64")\n",
+ __func__, expected_ring_name, expected_offset);
while (getline(&line, &line_size, file) > 0) {
char *dashes;