| Message ID | 20240816034905.3541020-2-trini@konsulko.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/3] test/overlay: Make this depend on SANDBOX | expand |
On Thu, 15 Aug 2024 at 21:49, Tom Rini <trini@konsulko.com> wrote: > > While we have a symbol for controlling if we will be testing BOOTSTD or > not, and it depends on SANDBOX, we do not control the building of > test/boot/ content correctly. Guard the current bootstd tests with > a check for UT_BOOTSTD and leave the measurement test available. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > Cc: Simon Glass <sjg@chromium.org> > > I'm unsure about the VPL and UPL tests, but they aren't causing failure > to build yet, so they can be sorted out later if they're a problem. > --- > test/boot/Makefile | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org> > > diff --git a/test/boot/Makefile b/test/boot/Makefile > index 8ec5daa7bfe7..d8eded20d4ff 100644 > --- a/test/boot/Makefile > +++ b/test/boot/Makefile > @@ -2,12 +2,15 @@ > # > # Copyright 2021 Google LLC > > +ifdef CONFIG_UT_BOOTSTD > obj-$(CONFIG_BOOTSTD) += bootdev.o bootstd_common.o bootflow.o bootmeth.o > obj-$(CONFIG_FIT) += image.o > -obj-$(CONFIG_MEASURED_BOOT) += measurement.o > > obj-$(CONFIG_EXPO) += expo.o > obj-$(CONFIG_CEDIT) += cedit.o > +endif > + > +obj-$(CONFIG_MEASURED_BOOT) += measurement.o > > ifdef CONFIG_OF_LIVE > obj-$(CONFIG_BOOTMETH_VBE_SIMPLE) += vbe_simple.o > -- > 2.34.1 >
diff --git a/test/boot/Makefile b/test/boot/Makefile index 8ec5daa7bfe7..d8eded20d4ff 100644 --- a/test/boot/Makefile +++ b/test/boot/Makefile @@ -2,12 +2,15 @@ # # Copyright 2021 Google LLC +ifdef CONFIG_UT_BOOTSTD obj-$(CONFIG_BOOTSTD) += bootdev.o bootstd_common.o bootflow.o bootmeth.o obj-$(CONFIG_FIT) += image.o -obj-$(CONFIG_MEASURED_BOOT) += measurement.o obj-$(CONFIG_EXPO) += expo.o obj-$(CONFIG_CEDIT) += cedit.o +endif + +obj-$(CONFIG_MEASURED_BOOT) += measurement.o ifdef CONFIG_OF_LIVE obj-$(CONFIG_BOOTMETH_VBE_SIMPLE) += vbe_simple.o
While we have a symbol for controlling if we will be testing BOOTSTD or not, and it depends on SANDBOX, we do not control the building of test/boot/ content correctly. Guard the current bootstd tests with a check for UT_BOOTSTD and leave the measurement test available. Signed-off-by: Tom Rini <trini@konsulko.com> --- Cc: Simon Glass <sjg@chromium.org> I'm unsure about the VPL and UPL tests, but they aren't causing failure to build yet, so they can be sorted out later if they're a problem. --- test/boot/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)