From 636e07915f3f6696af9eb891c6e9f94a210f2f85 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 15 Aug 2024 21:49:03 -0600 Subject: [PATCH 1/3] test/overlay: Make this depend on SANDBOX As the overlays are sandbox specific, mark the whole test as depending on sandbox. Reviewed-by: Simon Glass Signed-off-by: Tom Rini --- test/overlay/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/overlay/Kconfig b/test/overlay/Kconfig index a4f154415db..881848968bb 100644 --- a/test/overlay/Kconfig +++ b/test/overlay/Kconfig @@ -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 From 916a4704fc868ef230ad920851e93161eaf995b4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 15 Aug 2024 21:49:04 -0600 Subject: [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. Reviewed-by: Simon Glass Signed-off-by: Tom Rini --- test/boot/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/boot/Makefile b/test/boot/Makefile index 8ec5daa7bfe..d8eded20d4f 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 From 2191c117338849639a7c0519d4908fce43783c0e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 15 Aug 2024 21:49:05 -0600 Subject: [PATCH 3/3] test/cmd: Move wget test to under a sandbox guard This test is sandbox-centric, so guard it so. Reviewed-by: Simon Glass Signed-off-by: Tom Rini --- test/cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cmd/Makefile b/test/cmd/Makefile index 478ef4c6f05..8f2134998ad 100644 --- a/test/cmd/Makefile +++ b/test/cmd/Makefile @@ -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