| Message ID | 20210527031753.3729663-1-keescook@chromium.org |
|---|---|
| State | Accepted |
| Commit | de53fa9baa701963722e9fa3d0fe34b897104497 |
| Headers | show |
| Series | selftests: lib.mk: Also install "config" and "settings" | expand |
On 5/26/21 9:17 PM, Kees Cook wrote: > Installed seccomp tests would time out because the "settings" file was > missing. Install both "settings" (needed for proper test execution) and > "config" (needed for informational purposes) with the other test > targets. > > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > tools/testing/selftests/lib.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk > index 0af84ad48aa7..fa2ac0e56b43 100644 > --- a/tools/testing/selftests/lib.mk > +++ b/tools/testing/selftests/lib.mk > @@ -100,6 +100,7 @@ define INSTALL_RULE > $(eval INSTALL_LIST = $(TEST_CUSTOM_PROGS)) $(INSTALL_SINGLE_RULE) > $(eval INSTALL_LIST = $(TEST_GEN_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE) > $(eval INSTALL_LIST = $(TEST_GEN_FILES)) $(INSTALL_SINGLE_RULE) > + $(eval INSTALL_LIST = $(wildcard config settings)) $(INSTALL_SINGLE_RULE) > endef > > install: all > I will pick this up for 5.14 thanks, -- Shuah
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 0af84ad48aa7..fa2ac0e56b43 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -100,6 +100,7 @@ define INSTALL_RULE $(eval INSTALL_LIST = $(TEST_CUSTOM_PROGS)) $(INSTALL_SINGLE_RULE) $(eval INSTALL_LIST = $(TEST_GEN_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE) $(eval INSTALL_LIST = $(TEST_GEN_FILES)) $(INSTALL_SINGLE_RULE) + $(eval INSTALL_LIST = $(wildcard config settings)) $(INSTALL_SINGLE_RULE) endef install: all
Installed seccomp tests would time out because the "settings" file was missing. Install both "settings" (needed for proper test execution) and "config" (needed for informational purposes) with the other test targets. Signed-off-by: Kees Cook <keescook@chromium.org> --- tools/testing/selftests/lib.mk | 1 + 1 file changed, 1 insertion(+)