Skip to content

xtest: make the dev kit configuration a required input - #826

Merged
jenswikl merged 1 commit into
OP-TEE:masterfrom
andrew2311:xtest-dev-kit-conf
Aug 10, 2026
Merged

xtest: make the dev kit configuration a required input#826
jenswikl merged 1 commit into
OP-TEE:masterfrom
andrew2311:xtest-dev-kit-conf

Conversation

@andrew2311

@andrew2311 andrew2311 commented Jul 29, 2026

Copy link
Copy Markdown

Turn the -include of the dev kit conf.mk into a hard include, so that a missing configuration fails the build.

The CFG_ flags it carries select which tests are built, and -include accepts it missing: the flags come out empty and the tests they select are dropped from xtest with no diagnostic, which is issue #275. optee_os now generates the configuration while the Android makefiles are parsed, so conf.mk is there by the time this file is read.

@jforissier jforissier left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Acked-by: Jerome Forissier <jerome.forissier@arm.com>

Turn the -include of the dev kit conf.mk into a hard include, so that a
missing configuration fails the build.

The CFG_ flags it carries select which tests are built, and -include
accepts it missing: the flags come out empty and the tests they select are
dropped from xtest with no diagnostic, which is issue OP-TEE#275. optee_os now
generates the configuration while the Android makefiles are parsed, so
conf.mk is there by the time this file is read.

Signed-off-by: Andrii Shtompel <andrii_shtompel@epam.com>
Acked-by: Jerome Forissier <jerome.forissier@arm.com>
@jenswikl

jenswikl commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Why is this still set to work-in-progress? Is anything missing before I can merge it?

@jforissier

Copy link
Copy Markdown
Contributor

Why is this still set to work-in-progress? Is anything missing before I can merge it?

I believe this is draft only due to the dependency on OP-TEE/optee_os#7897

@jenswikl

jenswikl commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Thanks, I noticed that later. :-)

@andrew2311
andrew2311 marked this pull request as ready for review August 6, 2026 12:44
@andrew2311

Copy link
Copy Markdown
Author

Ready to merge (dependency OP-TEE/optee_os#7897 was merged)

@jenswikl
jenswikl merged commit 38fa8ba into OP-TEE:master Aug 10, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants