From f871186da3f0365ff6182fbf2b92caef73355d9f Mon Sep 17 00:00:00 2001 From: David Cermak Date: Thu, 17 Sep 2020 15:08:54 +0200 Subject: [PATCH 1/2] idf.py: Fixed gdb target to exit cleanly when no openocd watch task When idf.py gdb starts, it expects openocd was started in the background and creates a thread to watch for openocd errors. when gdb target exits, the debug_ext.py aims to cleanup all threads and processes, but fails with traceback if openocd-watch thread not available, which could happen if openocd started separately. --- tools/idf_py_actions/debug_ext.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/idf_py_actions/debug_ext.py b/tools/idf_py_actions/debug_ext.py index 2b3dd03ec3..57d1829608 100644 --- a/tools/idf_py_actions/debug_ext.py +++ b/tools/idf_py_actions/debug_ext.py @@ -287,7 +287,11 @@ def action_extensions(base_actions, project_path): continue finally: watch_openocd.join() - processes["threads_to_join"].remove(watch_openocd) + try: + processes["threads_to_join"].remove(watch_openocd) + except ValueError: + # Valid scenario: watch_openocd task won't be in the list if openocd not started from idf.py + pass fail_if_openocd_failed = { "names": ["--require-openocd", "--require_openocd"], From 09714a4f1122f092f52a2bc46aa140cdbda7258e Mon Sep 17 00:00:00 2001 From: David Cermak Date: Mon, 12 Oct 2020 15:14:59 +0200 Subject: [PATCH 2/2] ci: add job for unit tests --- tools/ci/config/target-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index 600153d0e9..103a03b307 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -383,7 +383,7 @@ test_app_test_003: UT_001: extends: .unit_test_template - parallel: 38 + parallel: 39 tags: - ESP32_IDF - UT_T1_1