Merge branch 'feature/external_github_prs' into 'master'

Include external github PRs

Closes IDFGH-2291, IDFGH-2306, IDFGH-2315, and IDFGH-2307

See merge request espressif/esp-idf!6931
This commit is contained in:
Angus Gratton
2019-12-10 12:33:32 +08:00
9 changed files with 65 additions and 13 deletions

View File

@@ -12,7 +12,7 @@ static void mutex_release_task(void* arg)
TEST_FAIL_MESSAGE("should not be reached");
}
TEST_CASE("mutex released not by owner causes an assert", "[freertos][reset=abort,SW_CPU_RESET]")
TEST_CASE_ESP32("mutex released not by owner causes an assert", "[freertos][reset=abort,SW_CPU_RESET]")
{
SemaphoreHandle_t mutex = xSemaphoreCreateMutex();
xSemaphoreTake(mutex, portMAX_DELAY);

View File

@@ -124,7 +124,6 @@ void IRAM_ATTR timer_group0_isr(void *vp_arg)
{
// Clear interrupt
timer_group_clr_intr_status_in_isr(TIMER_GROUP_0, TIMER_0);
timer_group_clr_intr_status_in_isr(TIMER_GROUP_0, TIMER_1);
timer_isr_fired = true;
TaskHandle_t handle = vp_arg;
@@ -170,6 +169,7 @@ static void test_resume_task_from_isr(int target_core)
vTaskDelay(1);
timer_deinit(TIMER_GROUP_0, TIMER_0);
TEST_ASSERT_TRUE(timer_isr_fired);
TEST_ASSERT_TRUE(resumed);
}

View File

@@ -86,7 +86,7 @@ static void task_test_tls(void *arg)
}
}
TEST_CASE("TLS test", "[freertos]")
TEST_CASE_ESP32("TLS test", "[freertos]")
{
const size_t stack_size = 3072;
StackType_t s_stack[stack_size]; /* with 8KB test task stack (default) this test still has ~3KB headroom */