aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-10-03 09:25:25 -0600
committerSimon Glass <sjg@chromium.org>2020-10-29 14:42:17 -0600
commit16a5068340f8d28e26436acf64e4dc5f652aa2a6 (patch)
treeddcce9ac0344cf914f2e4109b73db4a0ec63eaf7
parent82c468a049d8887b70b1826c9fda2388f14704ef (diff)
downloadu-boot-16a5068340f8d28e26436acf64e4dc5f652aa2a6.zip
u-boot-16a5068340f8d28e26436acf64e4dc5f652aa2a6.tar.gz
u-boot-16a5068340f8d28e26436acf64e4dc5f652aa2a6.tar.bz2
dm: test: Make use of CONFIG_UNIT_TEST
At present we always include test/dm from the main Makefile. We have a CONFIG_UNIT_TEST that should control whether the test/ directory is built, so rely on that instead. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--Makefile2
-rw-r--r--test/Makefile3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5b80eb2..89c42c1 100644
--- a/Makefile
+++ b/Makefile
@@ -807,7 +807,7 @@ libs-$(CONFIG_API) += api/
ifdef CONFIG_POST
libs-y += post/
endif
-libs-$(CONFIG_UNIT_TEST) += test/ test/dm/
+libs-$(CONFIG_UNIT_TEST) += test/
libs-$(CONFIG_UT_ENV) += test/env/
libs-$(CONFIG_UT_OPTEE) += test/optee/
libs-$(CONFIG_UT_OVERLAY) += test/overlay/
diff --git a/test/Makefile b/test/Makefile
index 73bddb4..ed3e882 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,8 +9,9 @@ obj-$(CONFIG_$(SPL_)CMDLINE) += command_ut.o
obj-$(CONFIG_$(SPL_)CMDLINE) += compression.o
obj-$(CONFIG_UNIT_TEST) += lib/
obj-y += log/
+obj-y += dm/
obj-$(CONFIG_$(SPL_)CMDLINE) += print_ut.o
obj-$(CONFIG_$(SPL_)CMDLINE) += str_ut.o
obj-$(CONFIG_UT_TIME) += time_ut.o
obj-$(CONFIG_UT_UNICODE) += unicode_ut.o
-obj-$(CONFIG_UNIT_TEST) += ut.o
+obj-y += ut.o