Merge GDB 7.5.1

gdb/testsuite/gdb.gdb/selftest.exp

 # Copyright 1988, 1990-1992, 1994, 1997, 1999-2000, 2002-2012 Free
 # Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Rob Savoye. (rob@cygnus.com)
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 
 # are we on a target board
 if { [is_remote target] || ![isnative] } then {
     return
 }
 
 # Not all of the lines of code near the start of main are executed for
 # every machine.  Also, optimization may reorder some of the lines.
 # So all we do is try to step or next over everything until we get
 # to a line that we know is always executed.
@@ skipping 52 matching lines @@
                 set command "step"
             }
             -re ".*cdarg = NULL.*$gdb_prompt $" {
                 set description "step over cdarg initialization"
                 set command "step"
             }
             -re ".*ttyarg = NULL.*$gdb_prompt $" {
                 set description "step over ttyarg initialization"
                 set command "step"
             }
+            -re ".*cmdarg_vec = NULL.*$gdb_prompt $" {
+                set description "step over cmdarg_vec initialization"
+                set command "step"
+            }
             -re ".*pre_stat_chain = make_command_stats_cleanup.*$gdb_prompt $" {
                 set description "next over make_command_stats_cleanup and everything it calls"
                 set command "next"
             }
             -re ".*START_PROGRESS.*$gdb_prompt $" {
                 # Note: ezannoni/2004/02/17: This check should be
                 # removed, since as of today that source line is not
                 # in gdb anymore.
                 set description "next over START_PROGRESS and everything it calls"
                 set command "next"
@@ skipping 16 matching lines @@
                 set command "next"
             }
             -re ".*if .i != 0.*$gdb_prompt $" {
                 set description "next over conditional stack alignment code 2"
                 set command "next"
             }
             -re ".*alloca .i - 4.*$gdb_prompt $" {
                 set description "next over conditional stack alignment alloca"
                 set command "next"
             }
-            -re ".*cmdsize = 1.*$gdb_prompt $" {
-                set description "step over cmdsize initialization"
-                set command "next"
-            }
-            -re ".*cmdarg = .* xmalloc.*$gdb_prompt $" {
-                set description "next over cmdarg initialization via xmalloc"
-                set command "next"
-            }
-            -re ".*ncmd = 0.*$gdb_prompt $" {
-                set description "next over ncmd initialization"
-                set command "next"
-            }
             -re ".*dirsize = 1.*$gdb_prompt $" {
                 set description "next over dirsize initialization"
                 set command "next"
             }
             -re ".*dirarg = .* xmalloc.*$gdb_prompt $" {
                 return
             }
             -re ".*setlocale .LC_MESSAGES,.*$gdb_prompt $" {
                 set description "next over setlocale LC_MESSAGES"
                 set command "next"
             }
             -re ".*setlocale .LC_CTYPE,.*$gdb_prompt $" {
                 set description "next over setlocale LC_CTYPE"
                 set command "next"
             }
             -re ".*bindtextdomain .PACKAGE, LOCALEDIR.;.*$gdb_prompt $" {
                 set description "next over bindtextdomain"
                 set command "next"
             }
             -re ".*textdomain .PACKAGE.;.*$gdb_prompt $" {
                 set description "next over textdomain PACKAGE"
                 set command "next"
             }
+            -re ".*VEC_cleanup .cmdarg_s.*$gdb_prompt $" {
+                set description "next over cmdarg_s VEC_cleanup"
+                set command "next"
+            }
             -re "\[0-9\]+\[\t \]+\{\r\n$gdb_prompt $" {
                 set description "step over initial brace"
                 set command "step"
             }
             -re ".*current_directory = gdb_dirbuf.*$gdb_prompt $" {
                 set description "step over current_directory initialization"
                 set command "step"
             }
             -re ".*gdb_sysroot = .*$gdb_prompt $" {
                 # NOTE: carlton/2003-01-15: More optimization reordering,
@@ skipping 215 matching lines @@
         }
         -re ".*No such file or directory.\r\n$gdb_prompt $" {
             pass "$description (no source available)"
         }
         -re "A file or directory .* does not exist..\r\n$gdb_prompt $" {
             pass "$description (no source available)"
         }
     }
 
     # start the "xgdb" process
-    gdb_test_multiple "continue" "xgdb is at prompt" {
-        -re "GNU gdb \[0-9\.\]*.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*License GPLv3\\+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.*This is free software: you are free to change and redistribute it.*There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\".*and \"show warranty\" for details.*This GDB was configured as .*$gdb_prompt $" {
-            pass "xgdb is at prompt"
+    if [target_info exists gdb,noinferiorio] {
+        # Maybe testing with a local extended-remote gdbserver.  With
+        # no way to interact with inferior GDB, all we can do is let
+        # it run.
+        send_gdb "continue\n"
+        # Wait a bit while the inferior gdb gets to its prompt.
+        sleep 1
+    } else {
+        set test "xgdb is at prompt"
+        gdb_test_multiple "continue" $test {
+            -re "GNU gdb \[0-9\.\]*.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*License GPLv3\\+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.*This is free software: you are free to change and redistribute it.*There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\".*and \"show warranty\" for details.*This GDB was configured as .*$gdb_prompt $" {
+                pass $test
+            }
+        }
+
+        # set xgdb prompt so we can tell which is which
+        gdb_test_multiple "set prompt (xgdb) " "Set xgdb_prompt" {
+            -re "\[(\]xgdb\[)\].*\[(\]xgdb\[)\] $" {
+                pass "Set xgdb prompt"
+            }
         }
     }
-    
-    # set xgdb prompt so we can tell which is which
-    gdb_test_multiple "set prompt (xgdb) " "Set xgdb_prompt" {
-        -re "\[(\]xgdb\[)\].*\[(\]xgdb\[)\] $" {
-            pass "Set xgdb prompt"
-        }
-    }
-    
+
     # kill the xgdb process
     set description "send ^C to child process"
     send_gdb "\003"
     gdb_expect {
         -re "Program received signal SIGINT.*$gdb_prompt $" {
             pass "$description"
         }
         -re ".*$gdb_prompt $" {
             fail "$description"
         }
@@ skipping 73 matching lines @@
 gdb_start
 set file [remote_download host $GDB_FULLPATH x$tool]
 set result [test_with_self $file];
 gdb_exit;
 catch "remote_file host delete $file";
 
 if {$result <0} then {
     warning "Couldn't test self"
     return -1
 }