From 304f0a399aa3b2f01c550595d4fdfd91469edad8 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 10 May 2017 17:26:25 +1000 Subject: [PATCH] freertos tests: Use CCOMPARE1 always in xPortInIsrContext() test Mismatched CCOMPARE meant test would only run once. --- components/freertos/test/test_freertos_isinisrcontext.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/freertos/test/test_freertos_isinisrcontext.c b/components/freertos/test/test_freertos_isinisrcontext.c index 9c7d31c27..a163688cc 100644 --- a/components/freertos/test/test_freertos_isinisrcontext.c +++ b/components/freertos/test/test_freertos_isinisrcontext.c @@ -31,12 +31,13 @@ static void testthread(void *arg) { in_int_context=0; int_handled=0; TEST_ASSERT(!xPortInIsrContext()); - xthal_set_ccompare(2, xthal_get_ccount()+8000000); - esp_intr_alloc(ETS_INTERNAL_TIMER1_INTR_SOURCE, 0, &testint, NULL, &handle); + xthal_set_ccompare(1, xthal_get_ccount()+8000000); + esp_err_t err = esp_intr_alloc(ETS_INTERNAL_TIMER1_INTR_SOURCE, 0, &testint, NULL, &handle); + TEST_ASSERT_EQUAL_HEX32(ESP_OK, err); vTaskDelay(100 / portTICK_PERIOD_MS); TEST_ASSERT(int_handled); TEST_ASSERT(in_int_context); - esp_intr_free(handle); + TEST_ASSERT_EQUAL_HEX32( ESP_OK, esp_intr_free(handle) ); vTaskDelete(NULL); }