From fcbcdf32d88d9eab7c15bff3a2a078f327b05d99 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 b4c8ed7adf..6e9f017a5c 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -461,31 +461,31 @@ "versions": [ { "linux-amd64": { - "sha256": "0973c2503909af3e430b7a2309b6162ca375671ab2b22e37cba5159eea142139", - "size": 1773107, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210401/openocd-esp32-linux64-0.10.0-esp32-20210401.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": "3703401322cc51f85cb44e3a14a788fdc45883051eac3428b4d7bdf323dee2c7", - "size": 1829351, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210401/openocd-esp32-armel-0.10.0-esp32-20210401.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": "cb9e8d486197fc6e8080fde089fa3e92770f8c7af01971a57d4ca9b424264b63", - "size": 1859246, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210401/openocd-esp32-macos-0.10.0-esp32-20210401.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-20210401", + "name": "v0.10.0-esp32-20210902", "status": "recommended", "win32": { - "sha256": "931bc4c4587e0713d4fc4fbc81b9a79c8228268e61fcd14b2bdcb2f8bd519ef9", - "size": 2253723, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210401/openocd-esp32-win32-0.10.0-esp32-20210401.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": "931bc4c4587e0713d4fc4fbc81b9a79c8228268e61fcd14b2bdcb2f8bd519ef9", - "size": 2253723, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210401/openocd-esp32-win32-0.10.0-esp32-20210401.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 9177682a7ef0648ce3d4bde8b1bc3277a7d09eb7 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 082b564340..f0e4fb7876 100644 --- a/examples/system/app_trace_to_host/example_test.py +++ b/examples/system/app_trace_to_host/example_test.py @@ -12,8 +12,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.OCDBackend(os.path.join(proj_path, 'openocd.log'), dut.app.target) as ocd: + with ttfw_idf.OCDBackend(oocd_log_path, dut.app.target) as ocd: dut.start_app() dut.expect_all('example: Enabling ADC1 on channel 6 / GPIO34.', 'example: Enabling CW generator on DAC channel 1', @@ -27,6 +28,15 @@ def test_examples_app_trace_to_host(env, extra_data): ocd.apptrace_start('file://adc.log 0 9000 5 0 0') ocd.apptrace_wait_stop(tmo=30) + 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.binary_path, 'app_trace_to_host.elf')]), From d1216728082efb02af2b880e576519534aa32f85 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 f91bd3e152..516d1064fc 100755 --- a/tools/test_idf_tools/test_idf_tools.py +++ b/tools/test_idf_tools/test_idf_tools.py @@ -56,7 +56,7 @@ XTENSA_ESP32S3_ELF = 'xtensa-esp32s3-elf' ESP32ULP_VERSION = '2.28.51-esp-20191205' ESP32S2ULP_VERSION = '2.28.51-esp-20191205' -OPENOCD_VERSION = 'v0.10.0-esp32-20210401' +OPENOCD_VERSION = 'v0.10.0-esp32-20210902' RISC_VERSION = 'esp-2021r1-8.4.0' XTENSA_ESP32_ELF_VERSION = 'esp-2021r1-8.4.0' XTENSA_ESP32S2_ELF_VERSION = 'esp-2021r1-8.4.0'