Merge tag 'execve-v6.11-rc1-fix1' of git://git.kernel.org/pub/scm/linux/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
This commit is contained in:
@ -8354,7 +8354,8 @@ F: Documentation/userspace-api/ELF.rst
|
|||||||
F: fs/*binfmt_*.c
|
F: fs/*binfmt_*.c
|
||||||
F: fs/Kconfig.binfmt
|
F: fs/Kconfig.binfmt
|
||||||
F: fs/exec.c
|
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/binfmts.h
|
||||||
F: include/linux/elf.h
|
F: include/linux/elf.h
|
||||||
F: include/uapi/linux/binfmts.h
|
F: include/uapi/linux/binfmts.h
|
||||||
|
@ -2150,5 +2150,5 @@ core_initcall(init_elf_binfmt);
|
|||||||
module_exit(exit_elf_binfmt);
|
module_exit(exit_elf_binfmt);
|
||||||
|
|
||||||
#ifdef CONFIG_BINFMT_ELF_KUNIT_TEST
|
#ifdef CONFIG_BINFMT_ELF_KUNIT_TEST
|
||||||
#include "binfmt_elf_test.c"
|
#include "tests/binfmt_elf_kunit.c"
|
||||||
#endif
|
#endif
|
||||||
|
@ -2236,5 +2236,5 @@ fs_initcall(init_fs_exec_sysctls);
|
|||||||
#endif /* CONFIG_SYSCTL */
|
#endif /* CONFIG_SYSCTL */
|
||||||
|
|
||||||
#ifdef CONFIG_EXEC_KUNIT_TEST
|
#ifdef CONFIG_EXEC_KUNIT_TEST
|
||||||
#include "exec_test.c"
|
#include "tests/exec_kunit.c"
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user