Thanks, applied as 0a14c9e3f5ca1e3abf3a1668e7bc2e7c59b984a1. Michael
[sent from post-receive hook] On Tue, 16 Sep 2025 21:44:42 +0200, Michael Tretter <[email protected]> wrote: > The optee-tests re-use some of the configure option for OP-TEE to enable > test suites. For example, the pkcs11 test suite is enabled and build, if > the PKCS#11 TA is enabled for OP-TEE. > > Allow setting these CFG_* options and by default pass the same options > as passed to OP-TEE itself. > > Signed-off-by: Michael Tretter <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/optee-test.in b/rules/optee-test.in > index 47859a299520..fdc68866b5a7 100644 > --- a/rules/optee-test.in > +++ b/rules/optee-test.in > @@ -1,6 +1,6 @@ > ## SECTION=security > > -config OPTEE_TEST > +menuconfig OPTEE_TEST > tristate > select OPTEE_CLIENT > select OPTEE_CLIENT_SUPPLICANT_PLUGINS > @@ -11,3 +11,18 @@ config OPTEE_TEST > The optee_test git contains the source code for the TEE sanity > testsuite in Linux using the ARM(R) TrustZone(R) technology. It is > distributed under the GPLv2 and BSD 2-clause open-source licenses. > + > +if OPTEE_TEST > + > +config OPTEE_TEST_CFG > + string > + prompt "OP-TEE CFG Flags" > + default "${PTXCONF_OPTEE_CFG}" > + help > + The optee-tests use some of the OP-TEE CFG flags for its own > + configuration and enabling test suites. Allow the user to pass > + additional options to configure the optee-tests. > + > + By default, pass the same options as passeed to OP-TEE. > + > +endif > diff --git a/rules/optee-test.make b/rules/optee-test.make > index 038b3461b342..fb70f44cca96 100644 > --- a/rules/optee-test.make > +++ b/rules/optee-test.make > @@ -40,6 +40,7 @@ OPTEE_TEST_MAKE_ENV := \ > TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \ > OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \ > CFG_TEE_PLUGIN_LOAD_PATH=/usr/lib/tee-supplicant/plugins \ > + $(call remove_quotes,$(PTXCONF_OPTEE_TEST_CFG)) \ > bindir=/usr/bin \ > libdir=/usr/lib >
