Message ID | 20240720170310.it.942-kees@kernel.org (mailing list archive) |
---|---|
State | Mainlined |
Commit | b6f5ee4d53019443fb99dd23bc08680b1244ccfa |
Headers | show |
Series | [v2] execve: Move KUnit tests to tests/ subdirectory | expand |
On Sat, Jul 20, 2024 at 10:03:14AM GMT, Kees Cook wrote: > 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. > > Reviewed-by: David Gow <davidgow@google.com> > Reviewed-by: SeongJae Park <sj@kernel.org> > Signed-off-by: Kees Cook <kees@kernel.org> > --- > v1: https://lore.kernel.org/lkml/20240717212230.work.346-kees@kernel.org/ > v2: file suffix changed to _kunit instead of _test > I'll toss this into -next and send it to Linus before -rc1 closes. Acked-by: Christian Brauner <brauner@kernel.org>
diff --git a/MAINTAINERS b/MAINTAINERS index 8dfbe998f175..396bd1f1e4b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8211,8 +8211,8 @@ S: Maintained F: rust/kernel/net/phy.rs EXEC & BINFMT API, ELF +M: Kees Cook <keescook@chromium.org> R: Eric Biederman <ebiederm@xmission.com> -R: Kees Cook <keescook@chromium.org> L: linux-mm@kvack.org 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_*_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 40111451aa95..04e748c5955f 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 5b580ff8d955..32d6537ece07 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