test_apps/panic: remove workaround for incorrect GDB backtrace

espressif · Oct 25, 2021 · 4548b6d · 4548b6d
1 parent 91696b9
commit 4548b6d
Showing 1 changed file with 18 additions and 21 deletions.
diff --git a/tools/test_apps/system/panic/panic_tests.py b/tools/test_apps/system/panic/panic_tests.py
@@ -51,13 +51,13 @@ 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):
@@ -103,13 +103,11 @@ 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 +185,9 @@ 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))