Commit 2347e6d2 authored by Daniel Vetter's avatar Daniel Vetter

lib: Introduce igt_fail_on/_f

I've yet again totally screwed things up (this time automated with
cocci even, but not yet pushed luckily). So finally add a new version
for easier conversion and adjust the cocci script.
Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 46811c84
......@@ -13,7 +13,14 @@ expression list[n] Ep;
)
- igt_fail(...);
- }
+ igt_assert_f(Ec, Ep);
+ igt_fail_on_f(Ec, Ep);
@@
expression Ec;
@@
- if (Ec) {
- igt_fail(...);
- }
+ igt_fail_on(Ec);
@@
expression Ec;
expression list[n] Ep;
......
......@@ -204,7 +204,7 @@ void igt_exit(void) __attribute__((noreturn));
* igt_assert:
* @expr: condition to test
*
* Fails (sub-)test if the condition is not met
* Fails (sub-)test if the condition is not met.
*
* Should be used everywhere where a test checks results.
*/
......@@ -218,7 +218,7 @@ void igt_exit(void) __attribute__((noreturn));
* @expr: condition to test
* @...: format string and optional arguments
*
* Fails (sub-)test if the condition is not met
* Fails (sub-)test if the condition is not met.
*
* Should be used everywhere where a test checks results.
*
......@@ -230,6 +230,30 @@ void igt_exit(void) __attribute__((noreturn));
__igt_fail_assert(99, __FILE__, __LINE__, __func__, #expr , f); \
} while (0)
/**
* igt_fail_on:
* @expr: condition to test
*
* Fails (sub-)test if the condition is met.
*
* Should be used everywhere where a test checks results.
*/
#define igt_fail_on(expr) igt_assert(!(expr))
/**
* igt_assert_f:
* @expr: condition to test
* @...: format string and optional arguments
*
* Fails (sub-)test if the condition is met.
*
* Should be used everywhere where a test checks results.
*
* In addition to the plain igt_assert() helper this allows to print additional
* information to help debugging test failures.
*/
#define igt_fail_on_f(expr, f...) igt_assert_f(!(expr), f)
/**
* igt_assert_cmpint:
* @n1: first value
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment