deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added default BOARD value to let regression tests compile for any platform.

Browse source
This commit is contained in:
Marco Grella 2015-11-11 13:48:38 +01:00
parent 41f9ca08e2
commit 527903ee10
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
platform/stm32nucleo-spirit1/Makefile.stm32nucleo-spirit1
View file

@ -1,14 +1,25 @@
CONTIKI_TARGET_DIRS = . CONTIKI_TARGET_DIRS = .
ifeq ($(BOARD),ids01a4) ifeq ($(BOARD),)
${info Using 868 MHz SPIRIT1 Board} BOARD=ids01a4
${info ***************************************************}
${info BOARD not specified, default to ids01a4 (868 MHz)!}
${info ***************************************************}
else ifeq ($(BOARD),ids01a4)
${info ***************************************************}
${info Using ids01a4 SPIRIT1 expansion board (868 MHz)}
${info ***************************************************}
else ifeq ($(BOARD),ids01a5) else ifeq ($(BOARD),ids01a5)
${info Using 915 MHz SPIRIT1 Board} ${info ***************************************************}
${info Using ids01a5 SPIRIT1 expansion board (915 MHz)}
${info ***************************************************}
else else
${info You must specify which SPIRIT1 board you use:} ${info ***************************************************}
${info make BOARD=ids01a4 for X-NUCLEO-IDS01A4 (868 MHz)} ${info You must specify a valid SPIRIT1 board to use:}
${info make BOARD=ids01a5 for X-NUCLEO-IDS01A5 (915 MHz)} ${info make BOARD=ids01a4 for X-NUCLEO-IDS01A4 (868 MHz)}
${info make BOARD=ids01a5 for X-NUCLEO-IDS01A5 (915 MHz)}
${info ***************************************************}
${error } ${error }
endif endif
@ -18,11 +29,14 @@ PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET)
ifeq ($(SENSORBOARD),iks01a1) ifeq ($(SENSORBOARD),iks01a1)
${info Compiling with X-NUCLEO-IKS01A1 sensors files} ${info Compiling with X-NUCLEO-IKS01A1 sensors files}
${info ***************************************************}
-include $(PLATFORM_ROOT_DIR)/Makefile.$(SENSORBOARD) -include $(PLATFORM_ROOT_DIR)/Makefile.$(SENSORBOARD)
else ifeq ($(SENSORBOARD),) else ifeq ($(SENSORBOARD),)
${info NOT compiling files for any sensors expansion board} ${info NOT compiling files for any sensors expansion board}
${info ***************************************************}
else else
${info Error: SENSORBOARD can be: iks01a1} ${info Error: SENSORBOARD can be: iks01a1}
${info ***************************************************}
${error } ${error }
endif endif

1
regression-tests/Makefile.compile-test
View file

@ -41,7 +41,6 @@ define dooneexample
@echo Building example $(3): $(1) for target $(2) @echo Building example $(3): $(1) for target $(2)
@((cd $(EXAMPLESDIR)/$(1); \ @((cd $(EXAMPLESDIR)/$(1); \
export STM32W_CPUREV=CC; \ export STM32W_CPUREV=CC; \
export BOARD=ids01a5; \
make TARGET=$(2) clean && make TARGET=$(2) WERROR=1) > \ make TARGET=$(2) clean && make TARGET=$(2) WERROR=1) > \
$(3)-$(subst /,-,$(1))$(2).report 2>&1 && \ $(3)-$(subst /,-,$(1))$(2).report 2>&1 && \
(echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \ (echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \