gdb.base/bp-permanent.exp: Tighten regex

Trying to fix a permanent breakpoints bug, I broke "next" over a
regular breakpoint.  "next" would immediately hit the breakpoint the
program was already stopped at.  But, the "next over setup" test
failed to notice this and still issued a pass.  That's because the
regex matches "testsuite" in:

  Breakpoint 2 at 0x400687: file src/gdb/testsuite/gdb.base/bp-permanent.c, line 46.

gdb/testsuite/ChangeLog:
2015-03-05  Pedro Alves  <palves@redhat.com>

	* gdb.base/bp-permanent.exp: Tighten "next over setup" regex.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1a76cc8887d0957f6fcd1c7a82e90799be73abb6..dd98483397db699c47efa7492f02626d6648d3eb 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-05  Pedro Alves  <palves@redhat.com>
+
+       * gdb.base/bp-permanent.exp: Tighten "next over setup" regex.
+
 2015-03-04  Simon Marchi  <simon.marchi@ericsson.com>
 
        * lib/mi-support.exp (mi_expect_interrupt): Accept

diff --git a/gdb/testsuite/gdb.base/bp-permanent.exp b/gdb/testsuite/gdb.base/bp-permanent.exp
index d0ed991971bf4d469458ade43478a9c82561cb7a..81a5293e63234ddf7d2278d2eba6bb837a71db22 100644 (file)
--- a/gdb/testsuite/gdb.base/bp-permanent.exp
+++ b/gdb/testsuite/gdb.base/bp-permanent.exp
@@ -96,7 +96,7 @@ proc test {always_inserted sw_watchpoint} {
 
        # Run the "setup" function in the inferior.  This memcpy's the
        # breakpoint instruction to a buffer in the inferior.
-       gdb_test "next" "test.*" "next over setup"
+       gdb_test "next" "test_basics \\(\\).*" "next over setup"
 
        delete_breakpoints