gdb/testsuite: fix "set temporary breakpoint" DUPLICATEs

Commit c67f4e538 ("gdb/testsuite: make gdb.ada/mi_prot.exp stop at
expected location") introduced some DUPLICATEs in MI tests using
mi_continue_to_line, for example:

    DUPLICATE: gdb.ada/mi_ref_changeable.exp: mi_continue_to_line: set temporary breakpoint

These test names were previously differentiated by the location passed
to mi_continue_to_line.  Since the location can contain a path, that
commit removed the location from the test name, in favor of a hardcoded
string "set temporary breakpoint", hence removing the differentiator.

mi_continue_to_line receives a "test" parameter, containing a test
name.  Add a "with_test_prefix" with that name, so that all tests
recorded during mi_continue_to_line have this in their name.

mi_continue_to_line passes that "test" string to mi_get_stop_line, that
is a bit superfluous.  mi_get_stop_line only uses that string in case of
failures (it doesn't record a pass if everything goes fine).  Since it's
not crucial, just remove it, and adjust all callers.

Adjust three gdb.mi/mi-var-*.exp tests to use prefixes to differentiate
the multiple calls to mi_run_inline_test (which calls
mi_continue_to_line).

Change-Id: I511c6caa70499f8657b1cde37d71068d74d56a74

2 files changed, 4 insertions, 4 deletions

diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.exp b/gdb/testsuite/gdb.python/py-framefilter-mi.exp
index 39431a3..08f9e17 100644
--- a/gdb/testsuite/gdb.python/py-framefilter-mi.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter-mi.exp
@@ -50,7 +50,7 @@ mi_gdb_test "source ${remote_python_file}" ".*\\^done." "load python file"
 
 # Multiple blocks test
 mi_continue_to_line [gdb_get_line_number {Inner test breakpoint} ${srcfile}] \
-  "step to breakpoint"
+  "step to first breakpoint"
 
 mi_gdb_test "-stack-list-locals --all-values" \
     "\\^done,locals=\\\[{name=\"h\",value=\"9\"},{name=\"f\",value=\"42\"},{name=\"g\",value=\"19\"},{name=\"bar\",value=\"$hex \\\\\"Inside block x2\\\\\"\"},{name=\"d\",value=\"15\"},{name=\"e\",value=\"14\"},{name=\"foo\",value=\"$hex \\\\\"Inside block\\\\\"\"},{name=\"str\",value=\"$hex \\\\\"The End\\\\\"\"},{name=\"st2\",value=\"$hex \\\\\"Is Near\\\\\"\"},{name=\"b\",value=\"12\"},{name=\"c\",value=\"5\"}\\\]" \
@@ -62,7 +62,7 @@ mi_gdb_test "-stack-list-locals --all-values" \
     "stack-list-locals --all-values frame filters enabled"
 
 mi_continue_to_line [gdb_get_line_number {Backtrace end breakpoint} ${srcfile}] \
-  "step to breakpoint"
+  "step to second breakpoint"
 
 set any "\[^\"\]+"
 
diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp
index 3704ce3..b832b2c 100644
--- a/gdb/testsuite/gdb.python/py-mi.exp
+++ b/gdb/testsuite/gdb.python/py-mi.exp
@@ -231,7 +231,7 @@ mi_varobj_update_dynamic container2 \
 
 mi_continue_to_line \
     [gdb_get_line_number {MI outer breakpoint here} ${srcfile}] \
-    "step to outer breakpoint"
+    "step to first outer breakpoint"
 
 mi_create_dynamic_varobj outer outer 1 \
   "create outer varobj"
@@ -261,7 +261,7 @@ mi_varobj_update_with_type_change container int 0 "update after type change"
 
 mi_continue_to_line \
     [gdb_get_line_number {break to inspect struct and union} ${srcfile}] \
-    "step to outer breakpoint"
+    "step to second outer breakpoint"
 
 with_test_prefix "varobj nscont" {
     mi_create_dynamic_varobj nscont nstype 1 \