Merge branch 'bugfix/mbedtls_tests' into 'master'

fix mbedtls unit tests, fix IDF_VER when building a project outside ESP-IDF tree

- mbedTLS test needs about 5% more time to run (in debug mode) when building with 5.2.0, compared to 4.8.5. Increase the timeout to let the test pass.
- when doing `git describe` in IDF_VER definition, `-C $(IDF_PATH)` is needed to get the version of ESP-IDF, and not the project being built (which may not even be in git)

See merge request !411
This commit is contained in:
Ivan Grokhotkov 2017-01-12 09:47:15 +08:00
commit aece3d6fc6
2 changed files with 2 additions and 2 deletions

View file

@ -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");
}
}

View file

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