Merge tag 'execve-v6.11-rc1-fix1' of git://git.kernel.org/pub/scm/lin…

…ux/kernel/git/kees/linux Pull execve fix from Kees Cook: "This moves the exec and binfmt_elf tests out of your way and into the tests/ subdirectory, following the newly ratified KUnit naming conventions. :)" * tag 'execve-v6.11-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: execve: Move KUnit tests to tests/ subdirectory
mj22226 · Jul 24, 2024 · e9e9697 · e9e9697
2 parents 5ad7ff8 + b6f5ee4
commit e9e9697
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -8354,7 +8354,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
@@ -2150,5 +2150,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
@@ -2236,5 +2236,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 → fs/tests/binfmt_elf_kunit.c b/fs/binfmt_elf_test.c → fs/tests/binfmt_elf_kunit.c
diff --git a/fs/exec_test.c → fs/tests/exec_kunit.c b/fs/exec_test.c → fs/tests/exec_kunit.c