From 0f39eaa4ad248dd9e3aaf0bbca0b9459d1cec0e6 Mon Sep 17 00:00:00 2001 From: Alexey Gerenkov Date: Thu, 7 Jul 2022 20:17:05 +0300 Subject: [PATCH 1/2] tools: Updates OpenOCD version to 'v0.11.0-esp32-20220706' --- tools/tools.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/tools/tools.json b/tools/tools.json index cdd2bb68b6..7abe0be357 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -325,41 +325,41 @@ "versions": [ { "linux-amd64": { - "sha256": "3460945f3560ef673264a0259a33dcbf0dd18ac6b7b4862e89318655c62215c7", - "size": 1901040, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20211220/openocd-esp32-linux-amd64-0.11.0-esp32-20211220.tar.gz" + "sha256": "26f1f18dd93eb70a13203848d3fb1cc2e0de1fd6749c7dd771b2de8709735aed", + "size": 2011201, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220706/openocd-esp32-linux-amd64-0.11.0-esp32-20220706.tar.gz" }, "linux-arm64": { - "sha256": "65d4de147d37c04e1c65d020e9c38e90db5a71e9e0bc602f5c8e0f44e46cd098", - "size": 1792274, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20211220/openocd-esp32-linux-arm64-0.11.0-esp32-20211220.tar.gz" + "sha256": "f97792bc2852937ec0accb9f0eb2e49926c0f747a71f101a4e34aed75d2c6fcc", + "size": 1954685, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220706/openocd-esp32-linux-arm64-0.11.0-esp32-20220706.tar.gz" }, "linux-armel": { - "sha256": "4c03c5fdf73d9a4357cb5e2918c8e3d99900c7a1bb6d50e8712a8d38477398a0", - "size": 1943340, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20211220/openocd-esp32-linux-armel-0.11.0-esp32-20211220.tar.gz" + "sha256": "27e4c628994cf342e7fc5b07f49ca5533ba892fd8a150683a382a08758c3dfbe", + "size": 2050256, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220706/openocd-esp32-linux-armel-0.11.0-esp32-20220706.tar.gz" }, "linux-armhf": { - "sha256": "acbb2bf74454ad2e45bab690538082cd6538a687ba2ba3d233309eb985702aba", - "size": 1803024, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20211220/openocd-esp32-linux-armhf-0.11.0-esp32-20211220.tar.gz" + "sha256": "7f3b57332104e8b8e6194553365a70a9d3754878cfc063d5dc5d839513a63de9", + "size": 1902964, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220706/openocd-esp32-linux-armhf-0.11.0-esp32-20220706.tar.gz" }, "macos": { - "sha256": "689149120965a8c36c78c1852035b72f500f2a5b406f53624ed4c0a85c4e9a60", - "size": 1959080, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20211220/openocd-esp32-macos-0.11.0-esp32-20211220.tar.gz" + "sha256": "333ee2ec3c9b5dc6ad4509faae55335cdea7f8bf83a56bfcf5327e4497c8538a", + "size": 2077882, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220706/openocd-esp32-macos-0.11.0-esp32-20220706.tar.gz" }, - "name": "v0.11.0-esp32-20211220", + "name": "v0.11.0-esp32-20220706", "status": "recommended", "win32": { - "sha256": "18f5515c4cecce5866e2f7cc7ff536f1a21a624e40a61d24c9dea4a910657cbb", - "size": 2441430, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20211220/openocd-esp32-win32-0.11.0-esp32-20211220.zip" + "sha256": "c3d39eb4365a9947e71f1d3780ce031185bc6437f21186568a5c05f23f57a8d0", + "size": 2608736, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220706/openocd-esp32-win32-0.11.0-esp32-20220706.zip" }, "win64": { - "sha256": "18f5515c4cecce5866e2f7cc7ff536f1a21a624e40a61d24c9dea4a910657cbb", - "size": 2441430, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20211220/openocd-esp32-win32-0.11.0-esp32-20211220.zip" + "sha256": "c3d39eb4365a9947e71f1d3780ce031185bc6437f21186568a5c05f23f57a8d0", + "size": 2608736, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220706/openocd-esp32-win32-0.11.0-esp32-20220706.zip" } } ] From af87ee28888e004e5e2a352122b18ed4130d8320 Mon Sep 17 00:00:00 2001 From: Alexey Gerenkov Date: Mon, 15 Aug 2022 19:12:48 +0300 Subject: [PATCH 2/2] test/examples: Fixes expected GDB message upon thread hit breakpoint --- examples/get-started/hello_world/loadable_elf_example_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/get-started/hello_world/loadable_elf_example_test.py b/examples/get-started/hello_world/loadable_elf_example_test.py index bd1cbe05b4..04225f8b5f 100644 --- a/examples/get-started/hello_world/loadable_elf_example_test.py +++ b/examples/get-started/hello_world/loadable_elf_example_test.py @@ -64,7 +64,7 @@ class GDBProcess(CustomProcess): log_file = os.path.join(proj_path, 'gdb.log') super(GDBProcess, self).__init__(cmd, log_file) self.p.sendline('') # it is for "---Type to continue, or q to quit---" - i = self.p.expect_exact(['Thread 1 hit Temporary breakpoint 2, app_main ()', + i = self.p.expect_exact(['Thread 1 "main" hit Temporary breakpoint 2, app_main ()', 'Load failed']) if i == 0: Utility.console_log('gdb is at breakpoint') @@ -91,7 +91,7 @@ class GDBProcess(CustomProcess): def break_till_end(self): self.p.sendline('b esp_restart') self.p.sendline('c') - self.p.expect_exact('Thread 1 hit Breakpoint 3, esp_restart ()') + self.p.expect_exact('Thread 1 "main" hit Breakpoint 3, esp_restart ()') class SerialThread(object):