* 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 0c5ca1c0fc50b796659c10c265da3bcaefa1989b..176e683d7348738faa616e84f00f894ca8a9ba41 100644 (file)
--- 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 b7e69abfb1254c28cc037cc17b6b2a76fcbee884..a640928ff8688c9a5cd904a8c4f0db1b3c09be24 100644 (file)
--- 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 08a0f49e93fa94dc1d0b1e05e2d6763081e1b8dd..8956da162675948337a63e3caa86a4b455aca856 100644 (file)
--- 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"