From 046626de9a1f03cbb093cd83a02fe062c167599c Mon Sep 17 00:00:00 2001 From: Alexey Gerenkov Date: Fri, 3 Sep 2021 00:17:30 +0300 Subject: [PATCH 1/3] tools: Updates OpenOCD version to 'v0.10.0-esp32-20210902' --- tools/tools.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/tools.json b/tools/tools.json index a4e5a26ee0..aebaa4babb 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -343,31 +343,31 @@ "versions": [ { "linux-amd64": { - "sha256": "77a232510625c23489d9bf1b17bdadf56e95acf8f50ef8ebff51477f23c21ef0", - "size": 1729401, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-linux64-0.10.0-esp32-20200709.tar.gz" + "sha256": "bd7364b8bf4fa03eebbac7f8aba8632029c34946ee67d451c02182aae8bc38e0", + "size": 1802447, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-linux64-0.10.0-esp32-20210902.tar.gz" }, "linux-armel": { - "sha256": "b2cc6b7837f3cac23a752a8c43c6e0b19701ee0ec1eca4896833f0e82746062e", - "size": 1778274, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-armel-0.10.0-esp32-20200709.tar.gz" + "sha256": "32aa83aa815666bdd442751c75d3826132ecd1bf1ac56f8b2a195e28f0ee2128", + "size": 1801394, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-armel-0.10.0-esp32-20210902.tar.gz" }, "macos": { - "sha256": "97cf84dd3dfb129a7d4842599870a3b0dbb40b2713d3c5153738c44907e85d6e", - "size": 1811755, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-macos-0.10.0-esp32-20200709.tar.gz" + "sha256": "0c32e4400edf6c725eb24af8d9ea9395f799c06333db2b87bbd22831467aba54", + "size": 1909909, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-macos-0.10.0-esp32-20210902.tar.gz" }, - "name": "v0.10.0-esp32-20200709", + "name": "v0.10.0-esp32-20210902", "status": "recommended", "win32": { - "sha256": "b96b95607ca0c5899427f5b88cda7389da11f53ac857d3d2fe467e571af5137e", - "size": 2152463, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-win32-0.10.0-esp32-20200709.zip" + "sha256": "9ad2a5031f498bae20291f3a81f2eb2371b79a1e5b81a2119d911b27a8a7a2e5", + "size": 2281243, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-win32-0.10.0-esp32-20210902.zip" }, "win64": { - "sha256": "b96b95607ca0c5899427f5b88cda7389da11f53ac857d3d2fe467e571af5137e", - "size": 2152463, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-win32-0.10.0-esp32-20200709.zip" + "sha256": "9ad2a5031f498bae20291f3a81f2eb2371b79a1e5b81a2119d911b27a8a7a2e5", + "size": 2281243, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-win32-0.10.0-esp32-20210902.zip" } } ] From 35bdf4bee8f9e36080f4045dd30e83d8d199b891 Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Mon, 6 Sep 2021 15:37:51 +0200 Subject: [PATCH 2/3] CI: Check the number of detected cores of apptrace --- examples/system/app_trace_to_host/example_test.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/examples/system/app_trace_to_host/example_test.py b/examples/system/app_trace_to_host/example_test.py index 3f701540de..6ec238e8f6 100644 --- a/examples/system/app_trace_to_host/example_test.py +++ b/examples/system/app_trace_to_host/example_test.py @@ -11,8 +11,9 @@ def test_examples_app_trace_to_host(env, extra_data): dut = env.get_dut('app_trace_to_host', rel_project_path) idf_path = dut.app.get_sdk_path() proj_path = os.path.join(idf_path, rel_project_path) + oocd_log_path = os.path.join(proj_path, 'openocd.log') - with ttfw_idf.OCDProcess(os.path.join(proj_path, 'openocd.log')): + with ttfw_idf.OCDProcess(oocd_log_path): with ttfw_idf.TelnetProcess(os.path.join(proj_path, 'telnet.log')) as telnet_p: dut.start_app() dut.expect_all('example: Enabling ADC1 on channel 6 / GPIO34.', @@ -33,6 +34,15 @@ def test_examples_app_trace_to_host(env, extra_data): telnet_p.pexpect_proc.expect_exact('Tracing is STOPPED. Size is 9000 of 9000 @') telnet_p.pexpect_proc.expect_exact('Data: blocks incomplete 0, lost bytes: 0') + with open(oocd_log_path) as oocd_log: + cores = 1 if dut.app.get_sdkconfig().get('CONFIG_FREERTOS_UNICORE', '').replace('"','') == 'y' else 2 + params_str = 'App trace params: from {} cores'.format(cores) + for line in oocd_log: + if params_str in line: + break + else: + raise RuntimeError('"{}" could not be found in {}'.format(params_str, oocd_log_path)) + with ttfw_idf.CustomProcess(' '.join([os.path.join(idf_path, 'tools/esp_app_trace/logtrace_proc.py'), 'adc.log', os.path.join(dut.app.get_binary_path(rel_project_path), From ae21087d7e82d6acd15d184155e40d5d81b4800f Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Mon, 6 Sep 2021 15:52:48 +0200 Subject: [PATCH 3/3] CI: Fix idf_tools.py tests with the updated openocd version --- tools/test_idf_tools/test_idf_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test_idf_tools/test_idf_tools.py b/tools/test_idf_tools/test_idf_tools.py index c4064d1c78..978e81fa58 100755 --- a/tools/test_idf_tools/test_idf_tools.py +++ b/tools/test_idf_tools/test_idf_tools.py @@ -54,7 +54,7 @@ XTENSA_ESP32S2_ELF = 'xtensa-esp32s2-elf' ESP32ULP_VERSION = '2.28.51-esp-20191205' ESP32S2ULP_VERSION = '2.28.51-esp-20191205' -OPENOCD_VERSION = 'v0.10.0-esp32-20200709' +OPENOCD_VERSION = 'v0.10.0-esp32-20210902' XTENSA_ESP32_ELF_VERSION = 'esp-2020r3-8.4.0' XTENSA_ESP32S2_ELF_VERSION = 'esp-2020r3-8.4.0'