From b6f5ee4d53019443fb99dd23bc08680b1244ccfa Mon Sep 17 00:00:00 2001
From: Kees Cook <kees@kernel.org>
Date: Sat, 20 Jul 2024 10:03:14 -0700
Subject: [PATCH] execve: Move KUnit tests to tests/ subdirectory
Move the exec KUnit tests into a separate directory to avoid polluting
the local directory namespace. Additionally update MAINTAINERS for the
new files.
Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: SeongJae Park <sj@kernel.org>
Acked-by: Christian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20240720170310.it.942-kees@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
---
MAINTAINERS | 3 ++-
fs/binfmt_elf.c | 2 +-
fs/exec.c | 2 +-
fs/{binfmt_elf_test.c => tests/binfmt_elf_kunit.c} | 0
fs/{exec_test.c => tests/exec_kunit.c} | 0
5 files changed, 4 insertions(+), 3 deletions(-)
rename fs/{binfmt_elf_test.c => tests/binfmt_elf_kunit.c} (100%)
rename fs/{exec_test.c => tests/exec_kunit.c} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 8dfbe998f175f..5fa7e129a59eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8220,7 +8220,8 @@ F: Documentation/userspace-api/ELF.rst
F: fs/*binfmt_*.c
F: fs/Kconfig.binfmt
F: fs/exec.c
-F: fs/exec_test.c
+F: fs/tests/binfmt_*_kunit.c
+F: fs/tests/exec_kunit.c
F: include/linux/binfmts.h
F: include/linux/elf.h
F: include/uapi/linux/binfmts.h
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 40111451aa951..04e748c5955f0 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -2152,5 +2152,5 @@ core_initcall(init_elf_binfmt);
module_exit(exit_elf_binfmt);
#ifdef CONFIG_BINFMT_ELF_KUNIT_TEST
-#include "binfmt_elf_test.c"
+#include "tests/binfmt_elf_kunit.c"
#endif
diff --git a/fs/exec.c b/fs/exec.c
index 5b580ff8d9556..32d6537ece07d 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -2244,5 +2244,5 @@ fs_initcall(init_fs_exec_sysctls);
#endif /* CONFIG_SYSCTL */
#ifdef CONFIG_EXEC_KUNIT_TEST
-#include "exec_test.c"
+#include "tests/exec_kunit.c"
#endif
diff --git a/fs/binfmt_elf_test.c b/fs/tests/binfmt_elf_kunit.c
similarity index 100%
rename from fs/binfmt_elf_test.c
rename to fs/tests/binfmt_elf_kunit.c
diff --git a/fs/exec_test.c b/fs/tests/exec_kunit.c
similarity index 100%
rename from fs/exec_test.c
rename to fs/tests/exec_kunit.c
--
GitLab