aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/foll-fork.c3
-rw-r--r--gdb/testsuite/gdb.base/foll-fork.exp3
3 files changed, 10 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index acfde75..01cd4f7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-30 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.base/foll-fork.exp (unpatch child, breakpoint at exit call):
+ Force $srcfile file.
+ * gdb.base/foll-fork.c (callee): Comment out the printf call.
+
2009-11-27 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
* gdb.base/hbreak.exp: Disable for s390*-*-* targets.
diff --git a/gdb/testsuite/gdb.base/foll-fork.c b/gdb/testsuite/gdb.base/foll-fork.c
index b7e69ab..a640928 100644
--- a/gdb/testsuite/gdb.base/foll-fork.c
+++ b/gdb/testsuite/gdb.base/foll-fork.c
@@ -9,7 +9,8 @@ void callee (i)
int i;
#endif
{
- printf("callee: %d\n", i);
+ /* Any output corrupts GDB CLI expect strings.
+ printf("callee: %d\n", i); */
}
#ifdef PROTOTYPES
diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp
index c1eb1fc..8f5ebad 100644
--- a/gdb/testsuite/gdb.base/foll-fork.exp
+++ b/gdb/testsuite/gdb.base/foll-fork.exp
@@ -240,7 +240,8 @@ proc catch_fork_unpatch_child {} {
# Delete all breakpoints and catchpoints.
delete_breakpoints
- gdb_test "break $bp_exit" \
+ # Force $srcfile as the current GDB source can be in glibc sourcetree.
+ gdb_test "break $srcfile:$bp_exit" \
"Breakpoint .*file .*$srcfile, line .*" \
"unpatch child, breakpoint at exit call"