Bladeren bron

Merge branch 'bugfix/pthread_condvar_test_wrong_deinit' into 'master'

Bugfix/pthread condvar test wrong deinit

See merge request espressif/esp-idf!22729
Jakob Hasse 2 jaren geleden
bovenliggende
commit
356f139ef8

+ 1 - 0
components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt

@@ -5,4 +5,5 @@ cmake_minimum_required(VERSION 3.16)
 set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(test_pthread)

+ 3 - 3
components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cond_var.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -115,6 +115,6 @@ TEST_CASE("pthread cond wait", "[pthread]")
         TEST_ASSERT_EQUAL_INT(0, r);
     }
 
-    pthread_mutex_destroy(&cond);
-    pthread_mutex_destroy(&mutex);
+    TEST_ASSERT_EQUAL_INT(ESP_OK, pthread_cond_destroy(&cond));
+    TEST_ASSERT_EQUAL_INT(ESP_OK, pthread_mutex_destroy(&mutex));
 }