espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 11:44:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/idf_gdb_no_openocd_crash' into 'master'

Browse Source 
idf.py: Fixed gdb target to exit cleanly when no openocd watch task

Closes IDF-2157

See merge request espressif/esp-idf!10503
This commit is contained in:
Ivan Grokhotkov
2020-09-18 19:12:38 +08:00
parent 65c94dfb4c 3b3409fb20
commit 57a8dbb93d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/idf_py_actions/debug_ext.py
View File

@@ -287,7 +287,11 @@ def action_extensions(base_actions, project_path):
continue continue
finally: finally:
watch_openocd.join() 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 = { fail_if_openocd_failed = {
"names": ["--require-openocd", "--require_openocd"], "names": ["--require-openocd", "--require_openocd"],