wvtest_start_check_eq_str(__FILE__, __LINE__, (a), (b), true)
#define WVPASSLTSTR(a, b) \
wvtest_start_check_lt_str(__FILE__, __LINE__, (a), (b))
-#define WVFAIL(cond) \
- wvtest_start_check(__FILE__, __LINE__, "NOT(" #cond ")", !(cond))
-#define WVFAILEQ(a, b) \
+#define WVFAIL(cond) \
+ ({ typeof (cond) cond_ = (cond); \
+ wvtest_start_check(__FILE__, __LINE__, "NOT(" #cond ")", !(cond_)); \
+ cond_; })
+#define WVFAILEQ(a, b) \
wvtest_start_check_eq(__FILE__, __LINE__, (a), (b), false, #a, #b)
#define WVFAILEQSTR(a, b) \
wvtest_start_check_eq_str(__FILE__, __LINE__, (a), (b), false)