summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-11 15:32:29 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-11 15:32:29 +0000
commita2611b62008c8fd776ceaf718a24d96791671ae9 (patch)
tree450a2bf21ab70a3ec9c3bea0711cbca36b8c3d89
parent5bee53377fc69cc5268d8d75b1efe2321646c574 (diff)
downloadgcc-a2611b62008c8fd776ceaf718a24d96791671ae9.tar.gz
2014-07-11 Samuel Bronson <naesten@gmail.com>
* testsuite/lib/gdb-test.exp (gdb-test): Turn off GDB's auto-load, list loaded libs. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212459 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/testsuite/lib/gdb-test.exp11
2 files changed, 12 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 38a3c93f027..5aed5bac40c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -3,6 +3,9 @@
* testsuite/lib/libstdc++.exp (libstdc++_init): Set $GCC_COLORS=""
instead of insisting that GCC understand -fdiagnostics-color=never
+ * testsuite/lib/gdb-test.exp (gdb-test): Turn off GDB's auto-load,
+ list loaded libs.
+
2014-07-11 Samuel Bronson <naesten@gmail.com>
Matthias Klose <doko@ubuntu.com>
diff --git a/libstdc++-v3/testsuite/lib/gdb-test.exp b/libstdc++-v3/testsuite/lib/gdb-test.exp
index 2169f26d217..9cb6ecfce39 100644
--- a/libstdc++-v3/testsuite/lib/gdb-test.exp
+++ b/libstdc++-v3/testsuite/lib/gdb-test.exp
@@ -116,10 +116,18 @@ proc gdb-test { marker {selector {}} } {
global gdb_tests
set fd [open $cmd_file "w"]
+ # We don't want the system copy of the pretty-printers loaded
+ puts $fd "set auto-load no"
+ # Now that we've disabled auto-load, it's safe to set the target file
+ puts $fd "file ./$output_file"
+ # Load & register *our* copy of the pretty-printers
puts $fd "source $pycode"
puts $fd "python register_libstdcxx_printers(None)"
+ # And start the program
puts $fd "break $line"
puts $fd "run"
+ # So we can verify that we're using the right libs ...
+ puts $fd "info share"
set count 0
foreach {var result kind} $gdb_tests {
@@ -147,8 +155,7 @@ proc gdb-test { marker {selector {}} } {
puts $fd "quit"
close $fd
- send_log "Spawning: $gdb_name -nx -nw -quiet -batch -x $cmd_file ./$output_file\n"
- set res [remote_spawn target "$gdb_name -nx -nw -quiet -batch -x $cmd_file ./$output_file"]
+ set res [remote_spawn target "$gdb_name -nx -nw -quiet -batch -x $cmd_file "]
if { $res < 0 || $res == "" } {
unsupported "$testname"
return