test/overlay: Make this depend on SANDBOX
PATCH 1/3 test/overlay: Make this depend on SANDBOX
As the overlays are sandbox specific, mark the whole test as depending on sandbox.
---
Cc: Simon Glass <[email protected]>
--- test/overlay/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
test/overlay/Kconfig +1 -1
@@ -1,6 +1,6 @@ config UT_OVERLAY bool "Enable Device Tree Overlays Unit Tests" - depends on UNIT_TEST && OF_CONTROL + depends on UNIT_TEST && OF_CONTROL && SANDBOX default y select OF_LIBFDT_OVERLAY help
Signature · 1 line
2.34.1
PATCH 2/3 test/boot: Make BOOTSTD tests depend on UT_BOOTSTD
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.
---
Cc: Simon Glass <[email protected]>
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(-)
test/boot/Makefile +4 -1
@@ -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
Signature · 1 line
2.34.1
Re: [PATCH 2/3] test/boot: Make BOOTSTD tests depend on UT_BOOTSTD
Quoted 7 lines · Tom Rini
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_BOOTSTDand leave the measurement test available.Signed-off-by Tom Rini <[email protected]>
Quoted 8 lines
---
Cc: Simon Glass <[email protected]>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(-)
Quoted 25 lines
test/boot/Makefile +4
-2@@ -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
PATCH 3/3 test/cmd: Move wget test to under a sandbox guard
In reply to Tom RiniThis test is sandbox-centric, so guard it so.
--- test/cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
test/cmd/Makefile +1 -1
@@ -30,7 +30,7 @@ ifdef CONFIG_SANDBOX obj-$(CONFIG_CMD_MBR) += mbr.o obj-$(CONFIG_CMD_READ) += rw.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o +obj-$(CONFIG_CMD_WGET) += wget.o obj-$(CONFIG_ARM_FFA_TRANSPORT) += armffa.o endif obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o -obj-$(CONFIG_CMD_WGET) += wget.o
Signature · 1 line
2.34.1
Re: [PATCH 3/3] test/cmd: Move wget test to under a sandbox guard
Quoted 7 lines · Tom Rini
This test is sandbox-centric, so guard it so.
Signed-off-by Tom Rini <[email protected]>--- test/cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 17 lines
test/cmd/Makefile +1
-2@@ -30,7 +30,7 @@ ifdef CONFIG_SANDBOX obj-$(CONFIG_CMD_MBR) += mbr.o obj-$(CONFIG_CMD_READ) += rw.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o +obj-$(CONFIG_CMD_WGET) += wget.o obj-$(CONFIG_ARM_FFA_TRANSPORT) += armffa.o endif obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o -obj-$(CONFIG_CMD_WGET) += wget.o --2.34.1
Quoted 10 lines · Tom Rini
As the overlays are sandbox specific, mark the whole test as depending on sandbox.
Signed-off-by Tom Rini <[email protected]>---
Cc: Simon Glass <[email protected]>--- test/overlay/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
test/overlay/Kconfig +1
-2@@ -1,6 +1,6 @@ config UT_OVERLAY bool "Enable Device Tree Overlays Unit Tests" - depends on UNIT_TEST && OF_CONTROL + depends on UNIT_TEST && OF_CONTROL && SANDBOX default y select OF_LIBFDT_OVERLAY help --2.34.1
Quoted 4 lines · Tom Rini
As the overlays are sandbox specific, mark the whole test as depending on sandbox.
Applied to u-boot/next, thanks!
Signature · 1 line
Tom