patch ../102430195.patch

diff --git a/README.google b/README.google
index 020e361e07965562b71a45dad5c1272a98cfe637..21bc65f784fb6cecf429dfbf850ddb310d8d82c3 100644 (file)
--- a/README.google
+++ b/README.google
@@ -264,3 +264,10 @@ they are an ongoing maintenance burden.
 -      * solib-svr4.c (svr4_read_so_list): Ignore linux-vdso64.so.1, for ppc.
 +      * solib-svr4.c (svr4_read_so_list): Ignore linux-vdso64.so.1, for ppc,
 +      and update for -Wc++-compat changes.
+--- README.google      2015-09-05 18:49:14.000000000 -0700
++++ README.google      2015-09-05 18:55:44.000000000 -0700
++
++2015-09-05  Doug Evans  <dje@google.com>
++
++      testsuite/
++      * gdb.base/dprintf-detach.exp: Cope with local patch. Ref# 2180247

diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp
index 5ea4b65a02a5bd8f602599d40e3f4d789d50bcbb..700c8bed0894fe50854f58bc1f3dc07d1bcced62 100644 (file)
--- a/gdb/testsuite/gdb.base/dprintf-detach.exp
+++ b/gdb/testsuite/gdb.base/dprintf-detach.exp
@@ -82,7 +82,11 @@ proc dprintf_detach_test { breakpoint_always_inserted dprintf_style disconnected
                sleep 1
        }
 
-       gdb_test "attach $inferior_pid" "Attaching to program: $escapedbinfile, process $inferior_pid.*Reading symbols from.*" "$test"
+       # GOOGLE LOCAL: Ref# 2180247
+       # We don't see "Reading symbols from ..." here.
+       gdb_test "attach $inferior_pid" "Attaching to program: $escapedbinfile, process $inferior_pid.*" "$test"
+       global hex
+       gdb_test "p/x \$pc" "= $hex"
     }
 }