gdb-test.exp (gdb-test): Turn off GDB's auto-load, list loaded libs.

2014-07-11  Samuel Bronson  <naesten@gmail.com>

	* testsuite/lib/gdb-test.exp (gdb-test): Turn off GDB's auto-load,
	list loaded libs.

From-SVN: r212459

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 38a3c93f027e98184b09ae838b3edc76adb2bd7d..5aed5bac40cdfa59bbe529d183da3dc9cbdc8643 100644 (file)
--- 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 2169f26d2179c2b81b6977a78f2237939c66b433..9cb6ecfce3922b984485acfff34ff6ec69cc1ec5 100644 (file)
--- 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