Просмотр исходного кода

Merge branch 'bugfix/parallel_multi_heap_test' into 'master'

CI fix: multi heap host test parallel race

See merge request idf/esp-idf!2428
Angus Gratton 7 лет назад
Родитель
Сommit
46d6fd1ddf
2 измененных файлов с 6 добавлено и 0 удалено
  1. 2 0
      .gitignore
  2. 4 0
      components/heap/test_multi_heap_host/Makefile

+ 2 - 0
.gitignore

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

+ 4 - 0
components/heap/test_multi_heap_host/Makefile

@@ -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 \