From d6842e537c1830b2d38b23a46effa2368ea5ad40 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 11 Jan 2017 21:30:23 +0800 Subject: [PATCH 1/2] mbedtls: give SHA test slightly more time to run --- components/mbedtls/test/test_mbedtls_sha.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mbedtls/test/test_mbedtls_sha.c b/components/mbedtls/test/test_mbedtls_sha.c index 721c59b761..b18169827b 100644 --- a/components/mbedtls/test/test_mbedtls_sha.c +++ b/components/mbedtls/test/test_mbedtls_sha.c @@ -166,7 +166,7 @@ TEST_CASE("mbedtls SHA self-tests multithreaded", "[mbedtls]") xTaskCreate(tskRunSHASelftests, "SHASelftests2", 8192, NULL, 3, NULL); for(int i = 0; i < 2; i++) { - if(!xSemaphoreTake(done_sem, 10000/portTICK_PERIOD_MS)) { + if(!xSemaphoreTake(done_sem, 12000/portTICK_PERIOD_MS)) { TEST_FAIL_MESSAGE("done_sem not released by test task"); } } From dd73a405561ba41649252f87a40eb2285d8061cd Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 11 Jan 2017 22:47:44 +0800 Subject: [PATCH 2/2] build system: fix IDF_VER for projects outside of ESP-IDF tree --- make/project.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/project.mk b/make/project.mk index ee8c077943..43dab767a4 100644 --- a/make/project.mk +++ b/make/project.mk @@ -178,7 +178,7 @@ endif # Git version of ESP-IDF (of the form v1.0-285-g5c4f707) -IDF_VER := $(shell git describe) +IDF_VER := $(shell git -C $(IDF_PATH) describe) # Set default LDFLAGS