From: Joel Brobecker <brobecker@gnat.com>
Date: Mon, 21 Dec 2009 05:54:56 +0000 (+0000)
Subject:         * gdb.base/foll-fork.exp (unpatch child, breakpoint at exit call):
X-Git-Tag: gdb_7_0_1-2009-12-22-release~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70374f29e2a2b7a49676fd255108f1f4d165b1f1;p=thirdparty%2Fbinutils-gdb.git

    * 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.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0c5ca1c0fc5..176e683d734 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-21  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-12-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix spurious false FAILs.
diff --git a/gdb/testsuite/gdb.base/foll-fork.c b/gdb/testsuite/gdb.base/foll-fork.c
index b7e69abfb12..a640928ff86 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 08a0f49e93f..8956da16267 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"