UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Clean test.external_flash target

Browse Source
This commit is contained in:
Émilie Feral
2019-07-11 10:15:01 +02:00
parent 11863804f7
commit e89389591d
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ion/Makefile
View File

@@ -12,6 +12,7 @@ endif
SFLAGS += -Iion/include/ion/keyboard/$(ION_KEYBOARD_LAYOUT) SFLAGS += -Iion/include/ion/keyboard/$(ION_KEYBOARD_LAYOUT)
include ion/src/$(PLATFORM)/Makefile include ion/src/$(PLATFORM)/Makefile
-include ion/test/$(PLATFORM)/Makefile
include ion/src/shared/tools/Makefile include ion/src/shared/tools/Makefile
# We need to work around a GCC bug (concerning versions < 5.1). It is valid in # We need to work around a GCC bug (concerning versions < 5.1). It is valid in
@@ -42,10 +43,6 @@ tests += $(addprefix ion/test/,\
utf8_helper.cpp\ utf8_helper.cpp\
) )
TEST_EXT_FLASH_REPROGRAM ?= 0
SFLAGS += -DTEST_EXT_FLASH_REPROGRAM=$(TEST_EXT_FLASH_REPROGRAM)
external_flash_tests += ion/test/external_flash.cpp
ifdef ION_STORAGE_LOG ifdef ION_STORAGE_LOG
SFLAGS += -DION_STORAGE_LOG=1 SFLAGS += -DION_STORAGE_LOG=1
endif endif

1
ion/test/device/Makefile Normal file
View File

@@ -0,0 +1 @@
include ion/test/device/$(MODEL)/Makefile

4
ion/test/device/n0110/Makefile Normal file
View File

@@ -0,0 +1,4 @@
TEST_EXT_FLASH_REPROGRAM ?= 0
SFLAGS += -DTEST_EXT_FLASH_REPROGRAM=$(TEST_EXT_FLASH_REPROGRAM)
test_ion_external_flash_src += ion/test/$(PLATFORM)/$(MODEL)/external_flash.cpp
$(call object_for,$(test_ion_external_flash_src)): SFLAGS += $(ION_DEVICE_SFLAGS)

0
ion/test/external_flash.cpp → ion/test/device/n0110/external_flash.cpp
View File

0
ion/test/external_flash_tests.ld → ion/test/device/n0110/external_flash_tests.ld
View File

4
quiz/Makefile
View File

@@ -4,13 +4,13 @@ QUIZ_USE_CONSOLE ?= 0
$(call object_for,quiz/src/runner.cpp): SFLAGS += -DQUIZ_USE_CONSOLE=$(QUIZ_USE_CONSOLE) $(call object_for,quiz/src/runner.cpp): SFLAGS += -DQUIZ_USE_CONSOLE=$(QUIZ_USE_CONSOLE)
define rule_for_quiz_symbols define rule_for_quiz_symbols
$$(BUILD_DIR)/quiz/src/$(1)_symbols.c: $$($(1)) | $$$$(@D)/. $$(BUILD_DIR)/quiz/src/$(subst _src,,$(1))_symbols.c: $$($(1)) | $$$$(@D)/.
@ echo "AWK $$@" @ echo "AWK $$@"
$$(Q) awk -f quiz/src/symbols.awk $$($(1)) > $$@ $$(Q) awk -f quiz/src/symbols.awk $$($(1)) > $$@
endef endef
$(eval $(call rule_for_quiz_symbols,tests)) $(eval $(call rule_for_quiz_symbols,tests))
$(eval $(call rule_for_quiz_symbols,external_flash_tests)) $(eval $(call rule_for_quiz_symbols,test_ion_external_flash_src))
runner_src += $(addprefix quiz/src/, \ runner_src += $(addprefix quiz/src/, \
assertions.cpp \ assertions.cpp \

6
scripts/targets.device.n0110.mak
View File

@@ -1,4 +1,4 @@
executables += test_external_flash executables += test.external_flash
$(BUILD_DIR)/test_external_flash.$(EXE): LDSCRIPT = ion/test/external_flash_tests.ld $(BUILD_DIR)/test.external_flash.$(EXE): LDSCRIPT = ion/test/device/n0110/external_flash_tests.ld
$(BUILD_DIR)/test_external_flash.$(EXE): $(BUILD_DIR)/quiz/src/external_flash_tests_symbols.o $(runner_objs) $(call object_for,$(tests_external_flash)) $(call object_for,$(ion_device_dfu_relocated_src)) $(BUILD_DIR)/test.external_flash.$(EXE): $(BUILD_DIR)/quiz/src/test_ion_external_flash_symbols.o $(call object_for,$(src) $(ion_device_dfu_relocated_src) $(test_ion_external_flash_src) $(runner_src))