Przeglądaj źródła

Merge branch 'bugfix/idf_gdb_no_openocd_crash' into 'master'

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

Closes IDF-2157

See merge request espressif/esp-idf!10503
Ivan Grokhotkov 5 lat temu
rodzic
commit
57a8dbb93d
1 zmienionych plików z 5 dodań i 1 usunięć
  1. 5 1
      tools/idf_py_actions/debug_ext.py

+ 5 - 1
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"],