diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-12-20 09:38:10 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-12-20 17:49:24 +0000 |
| commit | 851c417b6b7a4ea28af67cfad116c8b7dc1d263e (patch) | |
| tree | 1d3b0a659de4808b707bf6bf79b4a7027764bdde | |
| parent | d3bcc7d0a51a898b4fb1625d529907319d235ee7 (diff) | |
igt/kms_frontbuffer_tracking: Make assert(false) more informative
When reading CI failure reports seeing an "assertion false failed" is
confusing as you then have to look for the preceding explanation. Show
the actual condition that fails in the assert report. Note that this
gives the system a chance at a reprieve and avoids conflicting
information such as:
(kms_frontbuffer_tracking:1649) DEBUG: Test requirement passed: !fbc_not_enough_stolen()
(kms_frontbuffer_tracking:1649) DEBUG: Test requirement passed: !fbc_stride_not_supported()
(kms_frontbuffer_tracking:1649) INFO: FBC status:
FBC disabled: FBC enabled (active or scheduled)
(kms_frontbuffer_tracking:1649) CRITICAL: Test assertion failure function do_status_assertions, file kms_frontbuffer_tracking.c:1714:
(kms_frontbuffer_tracking:1649) CRITICAL: Failed assertion: false
(kms_frontbuffer_tracking:1649) CRITICAL: FBC disabled
Where the fbc status tells us that it was indeed enabled, but the
assertion still failed.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
| -rw-r--r-- | tests/kms_frontbuffer_tracking.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index a6f5f3773..1601cab45 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -1711,7 +1711,7 @@ static void do_status_assertions(int flags) igt_require(!fbc_stride_not_supported()); if (!fbc_wait_until_enabled()) { fbc_print_status(); - igt_assert_f(false, "FBC disabled\n"); + igt_assert_f(fbc_is_enabled(), "FBC disabled\n"); } if (opt.fbc_check_compression) @@ -1723,7 +1723,7 @@ static void do_status_assertions(int flags) if (flags & ASSERT_PSR_ENABLED) { if (!psr_wait_until_enabled()) { psr_print_status(); - igt_assert_f(false, "PSR disabled\n"); + igt_assert_f(psr_is_enabled(), "PSR disabled\n"); } } else if (flags & ASSERT_PSR_DISABLED) { igt_assert(!psr_wait_until_enabled()); |