From: Angus Gratton <angus@espressif.com>
Date: Tue, 22 May 2018 03:13:16 +0000 (+0800)
Subject: Merge branch 'bugfix/unit_test_timeout' into 'master'
X-Git-Tag: v3.1-beta1~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41bb1fcb48676e0f9faf6bbc38732ab33938bc74;p=esp-idf

Merge branch 'bugfix/unit_test_timeout' into 'master'

Unit tests: Add per-test timeout option, disable two SD tests

See merge request idf/esp-idf!2423
---

41bb1fcb48676e0f9faf6bbc38732ab33938bc74