Skip to content

Commit

Permalink
selftests/landlock: Redefine TEST_F() as TEST_F_FORK()
Browse files Browse the repository at this point in the history
This has the effect of creating a new test process for either TEST_F()
or TEST_F_FORK(), which doesn't change tests but will ease potential
backports.  See next commit for the TEST_F_FORK() merge into TEST_F().

Cc: Günther Noack <gnoack@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Will Drewry <wad@chromium.org>
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Mickaël Salaün authored and David S. Miller committed Mar 1, 2024
1 parent 7779f26 commit e740486
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion tools/testing/selftests/landlock/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
struct __test_metadata *_metadata, \
FIXTURE_DATA(fixture_name) *self, \
const FIXTURE_VARIANT(fixture_name) *variant); \
TEST_F(fixture_name, test_name) \
__TEST_F_IMPL(fixture_name, test_name, -1, TEST_TIMEOUT_DEFAULT) \
{ \
int status; \
const pid_t child = fork(); \
Expand Down Expand Up @@ -80,6 +80,10 @@
__attribute__((unused)) *variant)
/* clang-format on */

/* Makes backporting easier. */
#undef TEST_F
#define TEST_F(fixture_name, test_name) TEST_F_FORK(fixture_name, test_name)

#ifndef landlock_create_ruleset
static inline int
landlock_create_ruleset(const struct landlock_ruleset_attr *const attr,
Expand Down

0 comments on commit e740486

Please sign in to comment.