1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #12468 from cladmi/pr/make/parallel_flash_test

Makefile.include:  TERMFLASHDEPS to TERMDEPS so it also applies to `test`
This commit is contained in:
Alexandre Abadie 2019-10-16 11:46:18 +02:00 committed by GitHub
commit 8d0afb2d5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -640,16 +640,19 @@ flash-only: $(FLASHDEPS)
preflash: $(BUILD_BEFORE_FLASH)
$(PREFLASHER) $(PREFFLAGS)
TERMFLASHDEPS ?= $(filter flash flash-only,$(MAKECMDGOALS))
# Add TERMFLASHDEPS to TERMDEPS so it also applies to `test`
TERMDEPS += $(TERMFLASHDEPS)
termdeps: $(TERMDEPS)
term: $(filter flash flash-only, $(MAKECMDGOALS)) $(TERMDEPS)
term: $(TERMDEPS)
$(call check_cmd,$(TERMPROG),Terminal program)
$(TERMPROG) $(TERMFLAGS)
# Term without the pyterm added logging
# TERMFLAGS must be exported for `jlink.sh term_rtt`.
cleanterm: export PYTERMFLAGS += --noprefix --no-repeat-command-on-empty-line
cleanterm: $(filter flash, $(MAKECMDGOALS)) $(TERMDEPS)
cleanterm: $(TERMDEPS)
$(call check_cmd,$(TERMPROG),Terminal program)
$(TERMPROG) $(TERMFLAGS)