| Message ID | 1442498020-661-1-git-send-email-markos.chandras@imgtec.com |
|---|---|
| State | Superseded |
| Headers | show |
Dear Markos Chandras, On 09/17/2015 02:53 PM, Markos Chandras wrote: [snip] > diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk > index a188298006b1..6edf96f92bfa 100644 > --- a/package/libseccomp/libseccomp.mk > +++ b/package/libseccomp/libseccomp.mk > @@ -17,4 +17,23 @@ define LIBSECCOMP_FIXUP_M4_DIR > endef > LIBSECCOMP_POST_EXTRACT_HOOKS += LIBSECCOMP_FIXUP_M4_DIR > > +ifeq ($(BR2_PACKAGE_LIBSECCOMP_TESTS),y) > + > +define LIBSECCOMP_TESTS_BUILD > + $(MAKE) -C $(@D)/tests check-build You should be adding $(TARGET_MAKE_ENV) in front of $(MAKE). Anyway, there is a better solution which will make this define unnecessary. See comments below. > +endef Instead of doing a define to build the tests, you can change the target and use the 'check-build' one, which will not only build the tests and tools, but also will trigger the 'all' target. So: ifeq ($(BR2_PACKAGE_LIBSECCOMP_TESTS),y) # The 'check-build' target builds the tests and tools, and also # triggers the 'all' target. LIBSECCOMP_MAKE_OPTS += check-build > +define LIBSECCOMP_TESTS_INSTALL > + mkdir -p $(TARGET_DIR)/usr/libseccomp/{tests,tools} && \ > + for x in tests tools; do \ > + find $(@D)/$$x -maxdepth 1 \( -name "*.tests" -o -perm -a=x \) \ > + -type f -exec cp {} $(TARGET_DIR)/usr/libseccomp/$$x/ \; ; \ > + done > +endef > + I would remove this empty line since you are adding to the hooks variable the define immediately above. > +LIBSECCOMP_POST_BUILD_HOOKS += LIBSECCOMP_TESTS_BUILD This post-build hook is not needed since the define has been replaced by the LIBSECCOMP_MAKE_OPTS line. > +LIBSECCOMP_POST_INSTALL_TARGET_HOOKS += LIBSECCOMP_TESTS_INSTALL > + And I would remove this empty line as well. Regards, Vincent. > +endif > + > $(eval $(autotools-package)) >
diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in index 4c34c5466592..760a6f321142 100644 --- a/package/libseccomp/Config.in +++ b/package/libseccomp/Config.in @@ -15,6 +15,15 @@ config BR2_PACKAGE_LIBSECCOMP https://github.com/seccomp/libseccomp +config BR2_PACKAGE_LIBSECCOMP_TESTS + bool "Install libseccomp tests" + depends on BR2_PACKAGE_BASH && BR2_PACKAGE_LIBSECCOMP + help + Build and install the libseccomp testsuite. + +comment "libseccomp testsuite needs bash as running shell" + depends on !BR2_PACKAGE_BASH && BR2_PACKAGE_LIBSECCOMP + comment "libseccomp needs a toolchain w/ headers >= 3.12" depends on BR2_aarch64 || BR2_mips || BR2_mipsel || BR2_mips64 || \ BR2_mips64el || BR2_i386 || BR2_x86_64 diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index a188298006b1..6edf96f92bfa 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -17,4 +17,23 @@ define LIBSECCOMP_FIXUP_M4_DIR endef LIBSECCOMP_POST_EXTRACT_HOOKS += LIBSECCOMP_FIXUP_M4_DIR +ifeq ($(BR2_PACKAGE_LIBSECCOMP_TESTS),y) + +define LIBSECCOMP_TESTS_BUILD + $(MAKE) -C $(@D)/tests check-build +endef + +define LIBSECCOMP_TESTS_INSTALL + mkdir -p $(TARGET_DIR)/usr/libseccomp/{tests,tools} && \ + for x in tests tools; do \ + find $(@D)/$$x -maxdepth 1 \( -name "*.tests" -o -perm -a=x \) \ + -type f -exec cp {} $(TARGET_DIR)/usr/libseccomp/$$x/ \; ; \ + done +endef + +LIBSECCOMP_POST_BUILD_HOOKS += LIBSECCOMP_TESTS_BUILD +LIBSECCOMP_POST_INSTALL_TARGET_HOOKS += LIBSECCOMP_TESTS_INSTALL + +endif + $(eval $(autotools-package))
Add new config option to allow building and installing the libseccomp testsuite on the target. It's useful for testing the kernels' seccomp behavior for the target architecture. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> --- package/libseccomp/Config.in | 9 +++++++++ package/libseccomp/libseccomp.mk | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+)