aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorUlrich Weigand <uweigand@de.ibm.com>2010-10-19 21:28:33 +0000
committerUlrich Weigand <uweigand@de.ibm.com>2010-10-19 21:28:33 +0000
commit2c04da0de0bbdb77912b2afcedd6cb9a9d0c82fa (patch)
treefc3b0da66666dfc90a3621cfe8ee0db136a893c9 /gdb
parent79afc5ef5d41c629c2e26eee37aaceac4320b8d6 (diff)
downloadgdb-2c04da0de0bbdb77912b2afcedd6cb9a9d0c82fa.zip
gdb-2c04da0de0bbdb77912b2afcedd6cb9a9d0c82fa.tar.gz
gdb-2c04da0de0bbdb77912b2afcedd6cb9a9d0c82fa.tar.bz2
* gdb.base/foll-fork.exp: Make regexps to match catchpoint hits more
strict, but do not check for any particular function name within libc.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/foll-fork.exp11
2 files changed, 11 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2bdc9d0..a0a0761 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-19 Ulrich Weigand <uweigand@de.ibm.com>
+
+ * gdb.base/foll-fork.exp: Make regexps to match catchpoint hits more
+ strict, but do not check for any particular function name within libc.
+
2010-10-19 Sami Wagiaalla <swagiaal@redhat.com>
* gdb.cp/smartp.exp: New test.
diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp
index 4c5e53a..891aa38 100644
--- a/gdb/testsuite/gdb.base/foll-fork.exp
+++ b/gdb/testsuite/gdb.base/foll-fork.exp
@@ -122,7 +122,7 @@ proc catch_fork_child_follow {} {
set bp_after_fork [gdb_get_line_number "set breakpoint here"]
- gdb_test "catch fork" "Catchpoint .*(fork).*" \
+ gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" \
"explicit child follow, set catch fork"
# Verify that the catchpoint is mentioned in an "info breakpoints",
@@ -136,7 +136,7 @@ proc catch_fork_child_follow {} {
}
gdb_test "continue" \
- "Catchpoint.*(forked process.*),.*in .*(fork|__kernel_v?syscall).*" \
+ "Catchpoint \[0-9\]* \\(forked process \[0-9\]*\\),.*" \
"explicit child follow, catch fork"
# Verify that the catchpoint is mentioned in an "info breakpoints",
@@ -184,7 +184,7 @@ proc catch_fork_unpatch_child {} {
"unpatch child, set catch fork"
gdb_test "continue" \
- "Catchpoint.*\\(forked process.*\\).*,.*in .*(fork|__kernel_v?syscall).*" \
+ "Catchpoint \[0-9\]* \\(forked process \[0-9\]*\\),.*" \
"unpatch child, catch fork"
# Delete all breakpoints and catchpoints.
@@ -225,14 +225,15 @@ proc tcatch_fork_parent_follow {} {
set bp_after_fork [gdb_get_line_number "set breakpoint here"]
- gdb_test "catch fork" "Catchpoint .*(fork).*" \
+ gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" \
"explicit parent follow, set tcatch fork"
# ??rehrauer: I don't yet know how to get the id of the tcatch
# via this script, so that I can add a -do list to it. For now,
# do the follow stuff after the catch happens.
- gdb_test "continue" "in .*(fork|__kernel_v?syscall).*" \
+ gdb_test "continue" \
+ "Catchpoint \[0-9\]* \\(forked process \[0-9\]*\\),.*" \
"explicit parent follow, tcatch fork"
gdb_test_no_output "set follow-fork parent"