From 164537c795275024e34ff27bfc75578b8faebb31 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Mon, 28 May 2018 09:44:18 +0800 Subject: test/build.mk: Allow boards to specify test lists Some tests cannot be built on some boards (not enough SRAM, unusual configuration, etc.). Instead of the long list of exceptions in test/build.mk that we currently use, allow each board (or chip) build.mk to set test-list-y, and only use the default list if it is unset. BRANCH=poppy BUG=b:80167548 TEST=make buildalltests -j Change-Id: I803c691f419451aad4396529302a4805cbe3f9b5 Signed-off-by: Nicolas Boichat Reviewed-on: https://chromium-review.googlesource.com/1074572 Reviewed-by: Vincent Palatin Reviewed-on: https://chromium-review.googlesource.com/1080576 --- board/coffeecake/build.mk | 3 +++ board/glados_pd/build.mk | 3 +++ board/hadoken/build.mk | 3 +++ board/hammer/build.mk | 3 +++ board/samus/build.mk | 4 ++++ board/samus_pd/build.mk | 3 +++ board/servo_v4/build.mk | 3 +++ chip/g/build.mk | 3 +++ test/build.mk | 19 +------------------ 9 files changed, 26 insertions(+), 18 deletions(-) diff --git a/board/coffeecake/build.mk b/board/coffeecake/build.mk index 277c5c60f6..fb5a6fccdb 100644 --- a/board/coffeecake/build.mk +++ b/board/coffeecake/build.mk @@ -10,5 +10,8 @@ CHIP:=stm32 CHIP_FAMILY:=stm32f0 CHIP_VARIANT:=stm32f07x +# Not enough SRAM: Disable all tests +test-list-y= + board-y=board.o board-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o diff --git a/board/glados_pd/build.mk b/board/glados_pd/build.mk index ef1c9f1a91..3508c6c173 100644 --- a/board/glados_pd/build.mk +++ b/board/glados_pd/build.mk @@ -10,6 +10,9 @@ CHIP:=stm32 CHIP_FAMILY:=stm32f0 CHIP_VARIANT:=stm32f05x +# Not enough SRAM: Disable all tests +test-list-y= + board-y=board.o # This target builds RW only. Therefore, remove RO from dependencies. diff --git a/board/hadoken/build.mk b/board/hadoken/build.mk index f8bb859201..866f061888 100644 --- a/board/hadoken/build.mk +++ b/board/hadoken/build.mk @@ -10,4 +10,7 @@ CHIP:=nrf51 CHIP_FAMILY:=nrf51x22 CHIP_VARIANT:=nrf51822 +# Hadoken does not support scratchpad +test-list-y= + board-y=board.o diff --git a/board/hammer/build.mk b/board/hammer/build.mk index 28652fee93..b32a6b768a 100644 --- a/board/hammer/build.mk +++ b/board/hammer/build.mk @@ -10,5 +10,8 @@ CHIP:=stm32 CHIP_FAMILY:=stm32f0 CHIP_VARIANT:=stm32f07x +# Build tests that we care about for hammer +test-list-y=entropy rsa3 sha256 sha256_unrolled x25519 + board-y=board.o board-$(CONFIG_BATTERY_SMART)+=battery.o diff --git a/board/samus/build.mk b/board/samus/build.mk index 2ff7e66d94..c6c50e3885 100644 --- a/board/samus/build.mk +++ b/board/samus/build.mk @@ -9,4 +9,8 @@ # the IC is TI Stellaris LM4 CHIP:=lm4 +# Samus has board-specific chipset code, and the tests don't +# compile with it. Disable them for now. +test-list-y= + board-y=battery.o board.o power_sequence.o panel.o extpower.o diff --git a/board/samus_pd/build.mk b/board/samus_pd/build.mk index fa58b7833e..f161ab10f2 100644 --- a/board/samus_pd/build.mk +++ b/board/samus_pd/build.mk @@ -10,5 +10,8 @@ CHIP:=stm32 CHIP_FAMILY:=stm32f0 CHIP_VARIANT:=stm32f07x +# Not enough SRAM: Disable all tests +test-list-y= + board-y=board.o board-$(CONFIG_USB_POWER_DELIVERY)+=usb_mux.o usb_pd_policy.o diff --git a/board/servo_v4/build.mk b/board/servo_v4/build.mk index be86135868..6336bbfab6 100644 --- a/board/servo_v4/build.mk +++ b/board/servo_v4/build.mk @@ -10,6 +10,9 @@ CHIP:=stm32 CHIP_FAMILY:=stm32f0 CHIP_VARIANT:=stm32f07x +# Not enough SRAM: Disable all tests +test-list-y= + board-y=board.o board-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o diff --git a/chip/g/build.mk b/chip/g/build.mk index c2a5bd360c..b874151d53 100644 --- a/chip/g/build.mk +++ b/chip/g/build.mk @@ -117,6 +117,9 @@ endif $(out)/RO/ec.RO.flat: $(out)/util/signer $(out)/RW/ec.RW.flat: $(out)/util/signer +# Do not build any test on chip/g +test-list-y= + %.hex: %.flat ifneq ($(CONFIG_RW_B),) diff --git a/test/build.mk b/test/build.mk index 2bcd163655..08687e9d01 100644 --- a/test/build.mk +++ b/test/build.mk @@ -6,26 +6,9 @@ # on-board test binaries build # -test-list-y=pingpong timer_calib timer_dos timer_jump mutex utils utils_str +test-list-y ?= pingpong timer_calib timer_dos timer_jump mutex utils utils_str #disable: powerdemo -test-list-$(BOARD_BDS)+= - -test-list-$(BOARD_HAMMER)+=entropy - -# Samus has board-specific chipset code, and the tests don't -# compile with it. Disable them for now. -test-list-$(BOARD_SAMUS)= - -# So does Cr50 -test-list-$(BOARD_CR50)= - -# For some tests, we are running out of RAM. Disable them for now. -test-list-$(BOARD_GLADOS_PD)= -test-list-$(BOARD_CHELL_PD)= -test-list-$(BOARD_OAK_PD)= -test-list-$(BOARD_SAMUS_PD)= - # Emulator tests ifneq ($(TEST_LIST_HOST),) test-list-host=$(TEST_LIST_HOST) -- cgit v1.2.1