This reverts commit f3380b7b8a72f435daceb49f7f7513f3ea2ce5ea. The OPTIONAL_HANDLER macro, called by all ASSERT_* and EXPECT_* macros, must support an optional error handler. This is done with an optional block after the "for" loop.
This enable to pass 52/52 seccomp-bpf tests instead of 42/52. Signed-off-by: Mickaël Salaün <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Kees Cook <[email protected]> Cc: Shuah Khan <[email protected]> Cc: Will Drewry <[email protected]> --- tools/testing/selftests/kselftest_harness.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 432245faeab3..c56f72e07cd7 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -555,8 +555,7 @@ * return while still providing an optional block to the API consumer. */ #define OPTIONAL_HANDLER(_assert) \ - for (; _metadata->trigger; _metadata->trigger = __bail(_assert)) \ - ; + for (; _metadata->trigger; _metadata->trigger = __bail(_assert)) #define __EXPECT(_expected, _seen, _t, _assert) do { \ /* Avoid multiple evaluation of the cases */ \ -- 2.11.0
