From: Ivan Grokhotkov Date: Tue, 24 Jul 2018 12:48:12 +0000 (+0800) Subject: Merge branch 'bugfix/unit-test-build-fix' into 'master' X-Git-Tag: v3.2-beta1~391 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d50c03cc7da945659a2bc7853243b9b00585c03b;p=esp-idf Merge branch 'bugfix/unit-test-build-fix' into 'master' unit-test-app: don’t include project.mk for ut- targets See merge request idf/esp-idf!2619 --- d50c03cc7da945659a2bc7853243b9b00585c03b diff --cc tools/unit-test-app/Makefile index 293764399b,222cfb1361..272fbe8265 --- a/tools/unit-test-app/Makefile +++ b/tools/unit-test-app/Makefile @@@ -77,10 -78,9 +79,10 @@@ $(BINARIES_DIR)/%/$(PROJECT_NAME).bin: SDKCONFIG=$(BUILDS_DIR)/$*/sdkconfig \ SDKCONFIG_DEFAULTS=$(BUILDS_DIR)/$*/sdkconfig.defaults \ TEST_COMPONENTS="$${test_components}" \ + TEST_EXCLUDE_COMPONENTS="$${test_exclude_components}" \ TESTS_ALL=$${tests_all} \ EXCLUDE_COMPONENTS="$${exclude_components}" - $(MAKE) print_flash_cmd \ + $(MAKE) --silent print_flash_cmd \ BUILD_DIR_BASE=$(BUILDS_DIR)/$* \ SDKCONFIG=$(BUILDS_DIR)/$*/sdkconfig \ | sed -e 's:'$(BUILDS_DIR)/$*/'::g' \