Hi,
This is a long due cleanup to merge TEST_F_FORK() into TEST_F().
This second version includes Jakub's "child" default value fix, proper
signal handling (TEST_SIGNAL), and move fixture setup and teardown to
the grandchild process by default.
This also removes the step counter and simplify Landlock's test
teardowns by removing some umount calls.
See https://lore.kernel.org/r/[email protected]
Regards,
Mickaël Salaün (2):
selftests/landlock: Redefine TEST_F() as TEST_F_FORK()
selftests/harness: Merge TEST_F_FORK() into TEST_F()
tools/testing/selftests/kselftest_harness.h | 72 ++++++++++-----------
tools/testing/selftests/landlock/common.h | 58 +----------------
tools/testing/selftests/landlock/fs_test.c | 22 +++----
3 files changed, 48 insertions(+), 104 deletions(-)
base-commit: 90d35da658da8cff0d4ecbb5113f5fac9d00eb72
--
2.44.0
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 <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: Will Drewry <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Signed-off-by: Mickaël Salaün <[email protected]>
---
tools/testing/selftests/landlock/common.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/landlock/common.h b/tools/testing/selftests/landlock/common.h
index e64bbdf0e86e..f40146d40763 100644
--- a/tools/testing/selftests/landlock/common.h
+++ b/tools/testing/selftests/landlock/common.h
@@ -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(); \
@@ -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,
--
2.44.0