Multiple Ada task-specific breakpoints at the same address.

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.ada / tasks.exp

diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp
index 710deb05e414e7eff6987d65b772cc056859e6c8..088be6d31ee25c0d986304d142e617bc0a335a77 100644 (file)
--- a/gdb/testsuite/gdb.ada/tasks.exp
+++ b/gdb/testsuite/gdb.ada/tasks.exp
@@ -37,15 +37,35 @@ gdb_test "info tasks" \
                "\r\n"] \
          "info tasks before inserting breakpoint"
 
-# Now, insert a breakpoint that should stop only if task 3 stops.
-gdb_test "break break_me task 3" "Breakpoint .* at .*"
+# Insert a breakpoint that should stop only if task 1 stops.  Since
+# task 1 never calls break_me, this shouldn't actually ever trigger.
+# The fact that this breakpoint is created _before_ the next one
+# matters.  GDB used to have a bug where it would report the first
+# breakpoint in the list that matched the triggered-breakpoint's
+# address, no matter which task it was specific to.
+gdb_test "break break_me task 1" "Breakpoint .* at .*"
+
+# Now, insert a breakpoint that should stop only if task 3 stops, and
+# extract its number.
+set bp_number -1
+set test "break break_me task 3"
+gdb_test_multiple $test $test {
+    -re "Breakpoint (.*) at .*$gdb_prompt $" {
+       set bp_number $expect_out(1,string)
+       pass $test
+    }
+}
+
+if {$bp_number < 0} {
+    return
+}
 
 # Continue to that breakpoint.  Task 2 should hit it first, and GDB
 # is expected to ignore that hit and resume the execution.  Only then
 # task 3 will hit our breakpoint, and GDB is expected to stop at that
-# point.
+# point.  Also make sure that GDB reports the correct breakpoint number.
 gdb_test "continue" \
-         ".*Breakpoint.*, foo.break_me \\(\\).*" \
+         ".*Breakpoint $bp_number, foo.break_me \\(\\).*" \
          "continue to breakpoint"
 
 # Check that it is indeed task 3 that hit the breakpoint by checking