From 50aabfa2578a2dea6bba259c9c0532f3410fac19 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Thu, 18 Jun 2020 19:05:19 +0200 Subject: [PATCH] ci: update reference output of test_idf_monitor, minor cleanup --- tools/test_idf_monitor/idf_monitor_wrapper.py | 6 +++--- tools/test_idf_monitor/tests/core1_out.txt | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/test_idf_monitor/idf_monitor_wrapper.py b/tools/test_idf_monitor/idf_monitor_wrapper.py index 6d03d5573..20626a938 100644 --- a/tools/test_idf_monitor/idf_monitor_wrapper.py +++ b/tools/test_idf_monitor/idf_monitor_wrapper.py @@ -27,12 +27,12 @@ except ImportError: import idf_monitor -ELF_FILE = './dummy.elf' # ELF file used for starting the monitor +ELF_FILE = 'dummy.elf' # ELF file used for starting the monitor def monitor_serial_reader_state(serial_reader, file_to_create): """ - The pupose of this wrapper is to monitor the serial reader state of idf_monitor.py. file_to_create is created + The purpose of this wrapper is to monitor the serial reader state of idf_monitor.py. file_to_create is created after the serial reader thread has been started. The existence of this file will indicate to run_test_idf_monitor.py that idf_monitor.py is ready to process inputs. """ @@ -50,7 +50,7 @@ def main(): args = parser.parse_args() serial_instance = serial.serial_for_url(args.port, 115200, do_not_open=True) - monitor = idf_monitor.Monitor(serial_instance, ELF_FILE, args.print_filter, 'make', 'xtensa-esp32-elf-', 'CR') + monitor = idf_monitor.Monitor(serial_instance, ELF_FILE, args.print_filter, 'make', toolchain_prefix='xtensa-esp32-elf-', eol='CR') sys.stderr.write('Monitor instance has been created.\n') monitor_thread = threading.Thread(target=monitor_serial_reader_state, args=(monitor.serial_reader, args.serial_alive_file)) diff --git a/tools/test_idf_monitor/tests/core1_out.txt b/tools/test_idf_monitor/tests/core1_out.txt index 5118f34f2..1b9c14d19 100644 --- a/tools/test_idf_monitor/tests/core1_out.txt +++ b/tools/test_idf_monitor/tests/core1_out.txt @@ -36,7 +36,6 @@ I (401) esp_core_dump_uart: Press Enter to print core dump to UART... Core Dump detected! I (434) esp_core_dump_uart: Print core dump to uart... I (434) esp_core_dump_elf: Found tasks: 8 -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! espcoredump.py v0.4-dev =============================================================== ==================== ESP32 CORE DUMP START ==================== @@ -112,48 +111,40 @@ a15 0x0 0 6 process 1073412788 0x400812c4 in ?? () 7 process 1073432444 0x40087e10 in ?? () 8 process 1073413520 0x400812c4 in ?? () -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! ==================== THREAD 1 (TCB: 0x3ffb5e80, name: '') ===================== #0 0x400e37f7 in ?? () #1 0x400d0c31 in ?? () #2 0x40087018 in ?? () -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! ==================== THREAD 2 (TCB: 0x3ffb6d48, name: '') ===================== #0 0x40087010 in ?? () -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! ==================== THREAD 3 (TCB: 0x3ffb65e4, name: '') ===================== #0 0x40087010 in ?? () -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! ==================== THREAD 4 (TCB: 0x3ffb77a0, name: '') ===================== #0 0x400812c4 in ?? () #1 0x40089806 in ?? () #2 0x400898f3 in ?? () #3 0x40087018 in ?? () -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! ==================== THREAD 5 (TCB: 0x3ffb4bf0, name: '') ===================== #0 0x400812c4 in ?? () #1 0x4008913b in ?? () #2 0x400d0d5c in ?? () #3 0x40087018 in ?? () -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! ==================== THREAD 6 (TCB: 0x3ffafab4, name: '') ===================== #0 0x400812c4 in ?? () #1 0x40087e10 in ?? () #2 0x400d1f4b in ?? () #3 0x40087018 in ?? () -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! ==================== THREAD 7 (TCB: 0x3ffb477c, name: '') ===================== #0 0x40087e10 in ?? () #1 0x40081a2b in ?? () #2 0x40087018 in ?? () -ERROR: GDB/MI command failed (error / msg="No symbol table is loaded. Use the \"file\" command.")! ==================== THREAD 8 (TCB: 0x3ffafd90, name: '') ===================== #0 0x400812c4 in ?? ()