From 69da6a3c23278b201f579c67a3151e52e681b668 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 14 Sep 2022 10:24:11 +0200 Subject: [PATCH] system: fix gdbstub panic tests after the truncated backtrace is fixed GDB has been updated in 0007754 to fix the abort backtrace issue. This commit updates the test case to match the new (correct) behavior. --- tools/test_apps/system/panic/panic_tests.py | 32 ++++++--------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/tools/test_apps/system/panic/panic_tests.py b/tools/test_apps/system/panic/panic_tests.py index 10bd5fbac5..9b745d5f4b 100644 --- a/tools/test_apps/system/panic/panic_tests.py +++ b/tools/test_apps/system/panic/panic_tests.py @@ -51,13 +51,8 @@ def task_wdt_inner(env, test_name): dut.expect_backtrace() dut.expect_elf_sha256() dut.expect_none('Guru Meditation') - if ('gdbstub' in test_name): - test_common(dut, test_name, expected_backtrace=[ - # Backtrace interrupted when abort is called, IDF-842 - 'panic_abort', 'esp_system_abort' - ]) - else: - test_common(dut, test_name) + test_common(dut, test_name, expected_backtrace=[ + 'panic_abort', 'esp_system_abort', 'abort', 'task_wdt_isr', '_xt_lowint1'] + get_default_backtrace(dut.test_name)) def int_wdt_inner(env, test_name): @@ -70,7 +65,7 @@ def int_wdt_inner(env, test_name): dut.expect_backtrace() dut.expect_elf_sha256() dut.expect_none('Guru Meditation') - test_common(dut, test_name) + test_common(dut, test_name, expected_backtrace=get_default_backtrace(dut.test_name)) def int_wdt_cache_disabled_inner(env, test_name): @@ -83,7 +78,7 @@ def int_wdt_cache_disabled_inner(env, test_name): dut.expect_backtrace() dut.expect_elf_sha256() dut.expect_none('Guru Meditation') - test_common(dut, test_name) + test_common(dut, test_name, expected_backtrace=get_default_backtrace(dut.test_name)) def cache_error_inner(env, test_name): @@ -103,13 +98,8 @@ def abort_inner(env, test_name): dut.expect_backtrace() dut.expect_elf_sha256() dut.expect_none('Guru Meditation', 'Re-entered core dump') - if ('gdbstub' in test_name): - test_common(dut, test_name, expected_backtrace=[ - # Backtrace interrupted when abort is called, IDF-842 - 'panic_abort', 'esp_system_abort' - ]) - else: - test_common(dut, test_name) + test_common(dut, test_name, expected_backtrace=[ + 'panic_abort', 'esp_system_abort', 'abort'] + get_default_backtrace(dut.test_name)) def abort_cached_disabled_inner(env, test_name): @@ -187,10 +177,6 @@ def ub_inner(env, test_name): dut.expect_backtrace() dut.expect_elf_sha256() dut.expect_none('Guru Meditation', 'Re-entered core dump') - if ('gdbstub' in test_name): - test_common(dut, test_name, expected_backtrace=[ - # Backtrace interrupted when abort is called, IDF-842 - 'panic_abort', 'esp_system_abort' - ]) - else: - test_common(dut, test_name) + test_common(dut, test_name, + expected_backtrace=['panic_abort', 'esp_system_abort', '__ubsan_default_handler', '__ubsan_handle_out_of_bounds'] + + get_default_backtrace(dut.test_name))