Move the exec KUnit tests into a separate directory to avoid polluting the local directory namespace. Additionally update MAINTAINERS for the new files and mark myself as Maintainer.
Signed-off-by: Kees Cook <[email protected]> --- I'll toss this into -next and send it to Linus before -rc1 closes. --- Cc: Alexander Viro <[email protected]> Cc: Christian Brauner <[email protected]> Cc: Jan Kara <[email protected]> Cc: Eric Biederman <[email protected]> Cc: David Gow <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: [email protected] Cc: [email protected] --- MAINTAINERS | 5 +++-- fs/binfmt_elf.c | 2 +- fs/exec.c | 2 +- fs/{ => tests}/binfmt_elf_test.c | 0 fs/{ => tests}/exec_test.c | 0 5 files changed, 5 insertions(+), 4 deletions(-) rename fs/{ => tests}/binfmt_elf_test.c (100%) rename fs/{ => tests}/exec_test.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 8dfbe998f175..35474718c05b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8211,8 +8211,8 @@ S: Maintained F: rust/kernel/net/phy.rs EXEC & BINFMT API, ELF +M: Kees Cook <[email protected]> R: Eric Biederman <[email protected]> -R: Kees Cook <[email protected]> L: [email protected] S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve @@ -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_*_test.c +F: fs/tests/exec_test.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 40111451aa95..1a032811b304 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_test.c" #endif diff --git a/fs/exec.c b/fs/exec.c index 5b580ff8d955..5a59063c50b1 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_test.c" #endif diff --git a/fs/binfmt_elf_test.c b/fs/tests/binfmt_elf_test.c similarity index 100% rename from fs/binfmt_elf_test.c rename to fs/tests/binfmt_elf_test.c diff --git a/fs/exec_test.c b/fs/tests/exec_test.c similarity index 100% rename from fs/exec_test.c rename to fs/tests/exec_test.c -- 2.34.1
