Merge branch 'bugfix/parallel_multi_heap_test' into 'master'

CI fix: multi heap host test parallel race

See merge request idf/esp-idf!2428
This commit is contained in:
Angus Gratton 2018-05-22 13:30:58 +08:00
commit 46d6fd1ddf
2 changed files with 6 additions and 0 deletions

2
.gitignore vendored
View File

@ -51,3 +51,5 @@ examples/protocols/aws_iot/*/main/certs/*.pem.*
*.gcno
coverage.info
coverage_report/
test_multi_heap_host

View File

@ -1,6 +1,10 @@
TEST_PROGRAM=test_multi_heap
all: $(TEST_PROGRAM)
ifneq ($(filter clean,$(MAKECMDGOALS)),)
.NOTPARALLEL: # prevent make clean racing the other targets
endif
SOURCE_FILES = $(abspath \
../multi_heap.c \
../multi_heap_poisoning.c \