[gdb/testsuite] Fix gdb.ada/mi_catch_ex{,_hand}.exp FAILs

The test-case gdb.ada/mi_catch_ex.exp tests two scenarios.

The two scenarios are separated by:
- a mi_run_to_main (before commit b75d55d4d2 "Eliminate mi_run_to_main,
  introduce mi_clean_restart")
- a mi_runto_main (after that commit)

The now removed mi_run_to_main contained a mi_delete_breakpoints, while
mi_runto_main does not, which causes FAILs in the second scenario.

Fix this by adding the missing mi_delete_breakpoints in the test-case, and
likewise in gdb.ada/mi_catch_ex_hand.exp.

Reg-tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-10-14  Tom de Vries  <tdevries@suse.de>

	PR testsuite/26732
	* gdb.ada/mi_catch_ex.exp: Do mi_delete_breakpoints before running
	scenario 2.
	* gdb.ada/mi_catch_ex_hand.exp: Same.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4261e4a7204793da01753b3ca0d9b466a11518f9..fd8d921fdc2bb9e0b1b301dde0879830f95fed2c 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2020-10-14  Tom de Vries  <tdevries@suse.de>
+
+       PR testsuite/26732
+       * gdb.ada/mi_catch_ex.exp: Do mi_delete_breakpoints before running
+       scenario 2.
+       * gdb.ada/mi_catch_ex_hand.exp: Same.
+
 2020-10-13  Pedro Alves  <pedro@palves.net>
 
        * lib/mi-support.exp (mi_clean_restart): New.

diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index 103ec85f862b14a6ba3610d35ca46faab1ff6ec5..1d2625aa1a7e497bd2872b43267e6522c600dd15 100644 (file)
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -123,6 +123,7 @@ continue_to_exception \
 #  - continue, the program exits.
 
 with_test_prefix "scenario 2" {
+    mi_delete_breakpoints
     if {[mi_runto_main] < 0} {
        fail "cannot run to main, testcase aborted"
        return 0

diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
index ef3dd24979019054f3b15959dadceb8e8c854e4f..6e913c1031dfd6090950f4647d5683e47beb4956 100644 (file)
--- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
@@ -116,6 +116,7 @@ continue_to_exception_handler \
 #    but exit instead.
 
 with_test_prefix "scenario 2" {
+    mi_delete_breakpoints
     if {[mi_runto_main] < 0} {
        fail "cannot run to main, testcase aborted"
        return 0