* gdb.base/default.exp: Update check for "show version".

[binutils.git] / gdb / testsuite / gdb.base / default.exp

diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index 9f7384e58c4d2c7960331f8027f3497b8d551efb..6defb11a8cdea2ee42f8e708348360a73ba54f1c 100644 (file)
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -1,9 +1,30 @@
+#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003
+#   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 2 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# Please email any bugs, comments, and/or additions to this file to:
+# [email protected]
+

 # Start with a fresh gdb
 
 gdb_exit
 gdb_start
 
 # Start with a fresh gdb
 
 gdb_exit
 gdb_start
 

-match_max 8000
+set timeout 60

 
 #
 # test default actions of gdb commands
 
 #
 # test default actions of gdb commands


@@ -13,13 +34,23 @@ match_max 8000
 
 gdb_test "add-symbol-file" "add-symbol-file takes a file name and an address" "add-symbol-file"
 
 
 gdb_test "add-symbol-file" "add-symbol-file takes a file name and an address" "add-symbol-file"
 

+# test append
+gdb_test "append" "\"append\" must be followed by a subcommand\.\[\r\n\]+List of append subcommands:.*" 
+gdb_test "append binary" "\"append binary\" must be followed by a subcommand\.\[\r\n\]+List of append binary subcommands:.*" 
+gdb_test "append memory" "Missing filename\." 
+gdb_test "append value"  "Missing filename\." 
+gdb_test "append binary memory" "Missing filename\." 
+gdb_test "append binary value"  "Missing filename\." 
+

 setup_xfail "mips-idt-*"
 send_gdb "attach\n"
 setup_xfail "mips-idt-*"
 send_gdb "attach\n"

-expect {
+gdb_expect {

     -re "Argument required .(process-id|program) to attach.*$gdb_prompt $"\
                        { pass "attach" }
     -re "You can't do that when your target is `None'.*$gdb_prompt $"\
                        { pass "attach" }
     -re "Argument required .(process-id|program) to attach.*$gdb_prompt $"\
                        { pass "attach" }
     -re "You can't do that when your target is `None'.*$gdb_prompt $"\
                        { pass "attach" }

+    -re "You can't do that without a process to debug.*$gdb_prompt $"\
+                       { pass "attach" }

     -re "Don't know how to attach.  Try \"help target\"..*$gdb_prompt $"\
                        { pass "attach" }
     -re "Kill it. .y or n." {
     -re "Don't know how to attach.  Try \"help target\"..*$gdb_prompt $"\
                        { pass "attach" }
     -re "Kill it. .y or n." {


@@ -30,12 +61,6 @@ expect {
     timeout { fail "(timeout) attach" }
 }
 
     timeout { fail "(timeout) attach" }
 }
 

-# FIXME: attach kills the udi connection
-if { [istarget "a29k-*-udi"] } {
-    gdb_exit
-    gdb_start
-}
-

 if ![target_info exists use_gdb_stub] {
     gdb_test "break" "No default breakpoint address now." "break"
     foreach i "b br bre brea" {
 if ![target_info exists use_gdb_stub] {
     gdb_test "break" "No default breakpoint address now." "break"
     foreach i "b br bre brea" {


@@ -43,10 +68,15 @@ if ![target_info exists use_gdb_stub] {
     }
 
     
     }
 
     

-    setup_xfail "mips-idt-*" "a29k-*-udi"
+    setup_xfail "mips-idt-*"

     gdb_test "backtrace" "No stack."
     gdb_test "backtrace" "No stack."

+
+    # ba and bac are no longer unique command prefixes. So these tests
+    # elict an error from GDB.
+    # GDB needs to be fixed to map unique alias here for ba bac.
+    #

     foreach i "bt ba bac" {
     foreach i "bt ba bac" {

-       setup_xfail "mips-idt-*" "a29k-*-udi"
+       setup_xfail "mips-idt-*"

        gdb_test $i "No stack." "backtrace \"$i\" abbreviation"
     }
 } else {
        gdb_test $i "No stack." "backtrace \"$i\" abbreviation"
     }
 } else {


@@ -55,24 +85,16 @@ if ![target_info exists use_gdb_stub] {
 
 # This works on the MIPS IDT board, but confuses future tests.
 if ![istarget "mips-idt-*"] then {
 
 # This works on the MIPS IDT board, but confuses future tests.
 if ![istarget "mips-idt-*"] then {

-    setup_xfail "a29k-*-udi"

     gdb_test "continue" "The program is not being run." "continue"
     gdb_test "continue" "The program is not being run." "continue"

-    setup_xfail "a29k-*-udi"

     gdb_test "c" "The program is not being run." "continue \"c\" abbreviation"
 }
 
     gdb_test "c" "The program is not being run." "continue \"c\" abbreviation"
 }
 

-# FIXME: continue kills the udi connection
-if [istarget "a29k-*-udi"] then {
-    gdb_exit
-    gdb_start
-}
-

 #test call
 gdb_test "call" "The history is empty..*" "call"
 
 
 #test catch
 #test call
 gdb_test "call" "The history is empty..*" "call"
 
 
 #test catch

-gdb_test "catch" "No selected frame..*" "catch"
+gdb_test "catch" "Catch requires an event name..*" "catch"

 
 #test cd
 gdb_test "cd" "Argument required .new working directory.*" "cd"
 
 #test cd
 gdb_test "cd" "Argument required .new working directory.*" "cd"


@@ -99,10 +121,10 @@ gdb_test "delete breakpoints" "" "delete breakpoints"
 #test delete display
 # FIXME -- need to dump full output to detailed log
 send_gdb "delete display\n"
 #test delete display
 # FIXME -- need to dump full output to detailed log
 send_gdb "delete display\n"

-expect {
+gdb_expect {

     -re "Delete all auto-display expressions.*y or n. $" {
        send_gdb "y\n"
     -re "Delete all auto-display expressions.*y or n. $" {
        send_gdb "y\n"

-       expect {
+       gdb_expect {

            -re "$gdb_prompt $"     { pass "delete display prompt" }
            timeout             { fail "(timeout) delete display prompt" }
        }
            -re "$gdb_prompt $"     { pass "delete display prompt" }
            timeout             { fail "(timeout) delete display prompt" }
        }


@@ -114,11 +136,6 @@ expect {
 #test detach
 gdb_test "detach" "" "detach"
 
 #test detach
 gdb_test "detach" "" "detach"
 

-# FIXME: continue kills the udi connection
-if [istarget "a29k-*-udi"] then {
-    gdb_exit
-    gdb_start
-}

 if [istarget "h8300-*-hms"] then {
     gdb_exit
     gdb_start
 if [istarget "h8300-*-hms"] then {
     gdb_exit
     gdb_start


@@ -128,10 +145,10 @@ if [istarget "h8300-*-hms"] then {
 # FIXME -- need to dump full output to detailed log
 
 send_gdb "directory\n"
 # FIXME -- need to dump full output to detailed log
 
 send_gdb "directory\n"

-expect {
+gdb_expect {

     -re "Reinitialize source path to empty.*y or n. $"  {
        send_gdb "y\n"
     -re "Reinitialize source path to empty.*y or n. $"  {
        send_gdb "y\n"

-       expect {
+       gdb_expect {

            -re "Source directories searched: .cdir:.cwd.*$gdb_prompt $"\
                    { pass "directory prompt" }
            timeout             { fail "(timeout) directory prompt" }
            -re "Source directories searched: .cdir:.cwd.*$gdb_prompt $"\
                    { pass "directory prompt" }
            timeout             { fail "(timeout) directory prompt" }


@@ -161,6 +178,22 @@ gdb_test "document" "Argument required .name of command to define.*" "document"
 gdb_test "down" "No stack.*" "down"
 #test down-silently
 gdb_test "down-silently" "No stack." "down-silently"
 gdb_test "down" "No stack.*" "down"
 #test down-silently
 gdb_test "down-silently" "No stack." "down-silently"

+# test dump
+gdb_test "dump" "\"dump\" must be followed by a subcommand\.\[\r\n\]+List of dump subcommands:.*" 
+gdb_test "dump binary" "\"dump binary\" must be followed by a subcommand\.\[\r\n\]+List of dump binary subcommands:.*" 
+gdb_test "dump ihex" "\"dump ihex\" must be followed by a subcommand\.\[\r\n\]+List of dump ihex subcommands:.*" 
+gdb_test "dump memory" "Missing filename\." 
+gdb_test "dump srec" "\"dump srec\" must be followed by a subcommand\.\[\r\n\]+List of dump srec subcommands:.*" 
+gdb_test "dump tekhex" "\"dump tekhex\" must be followed by a subcommand\.\[\r\n\]+List of dump tekhex subcommands:.*" 
+gdb_test "dump value" "Missing filename\." 
+gdb_test "dump binary memory" "Missing filename\." 
+gdb_test "dump binary value"  "Missing filename\." 
+gdb_test "dump ihex memory" "Missing filename\." 
+gdb_test "dump ihex value"  "Missing filename\." 
+gdb_test "dump srec memory" "Missing filename\." 
+gdb_test "dump srec value"  "Missing filename\." 
+gdb_test "dump tekhex memory" "Missing filename\." 
+gdb_test "dump tekhex value"  "Missing filename\." 

 #test echo
 gdb_test "echo" "" "echo"
 #test enable breakpoints delete
 #test echo
 gdb_test "echo" "" "echo"
 #test enable breakpoints delete


@@ -179,8 +212,8 @@ gdb_test "enable once" "Argument required .one or more breakpoint numbers.*" "en
 gdb_test "enable" "" "enable"
 #test exec-file
 send_gdb "exec-file\n"
 gdb_test "enable" "" "enable"
 #test exec-file
 send_gdb "exec-file\n"

-expect {
-    -re "No exec file now..*$gdb_prompt $" {
+gdb_expect {
+    -re "No executable file now..*$gdb_prompt $" {

        pass "exec-file"
     }
     -re "exec-file.*A program is being debugged already.  Kill it. .y or n.*$" {
        pass "exec-file"
     }
     -re "exec-file.*A program is being debugged already.  Kill it. .y or n.*$" {


@@ -188,7 +221,7 @@ expect {
        if $verbose>1 then {
            send_user "\tDidn't kill program being debugged\n"
        }
        if $verbose>1 then {
            send_user "\tDidn't kill program being debugged\n"
        }

-       expect -re "$gdb_prompt $" { }
+       gdb_expect -re "$gdb_prompt $" { }

        pass "exec-file"
     }
     -re "$gdb_prompt $"        { fail "exec-file" }
        pass "exec-file"
     }
     -re "$gdb_prompt $"        { fail "exec-file" }


@@ -196,26 +229,23 @@ expect {
 }
 
 #test frame "f" abbreviation
 }
 
 #test frame "f" abbreviation

-setup_xfail "a29k-*-udi"

 gdb_test "f" "No stack." "frame \"f\" abbreviation"
 #test frame
 gdb_test "f" "No stack." "frame \"f\" abbreviation"
 #test frame

-setup_xfail "a29k-*-udi"

 gdb_test "frame" "No stack." "frame"
 #test fg
 gdb_test "frame" "No stack." "frame"
 #test fg

-setup_xfail "a29k-*-udi"

 gdb_test "fg" "The program is not being run." "fg"
 # FIXME: fg kills the udi connection
 #test file
 send_gdb "file\n"
 gdb_test "fg" "The program is not being run." "fg"
 # FIXME: fg kills the udi connection
 #test file
 send_gdb "file\n"

-expect {
-    -re "No exec file now..*$gdb_prompt $"\
+gdb_expect {
+    -re "No executable file now..*$gdb_prompt $"\

            { pass "file" }
     -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
        send_gdb "n\n"
        if $verbose>1 then {
            send_user "\t\tDidn't kill program being debugged\n"
        }
            { pass "file" }
     -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
        send_gdb "n\n"
        if $verbose>1 then {
            send_user "\t\tDidn't kill program being debugged\n"
        }

-       expect -re "$gdb_prompt $" { }
+       gdb_expect -re "$gdb_prompt $" { }

        pass "file"
     }
     -re ".*$gdb_prompt $"      { fail "file" }
        pass "file"
     }
     -re ".*$gdb_prompt $"      { fail "file" }


@@ -223,28 +253,47 @@ expect {
 }
 
 #test finish
 }
 
 #test finish

-setup_xfail "a29k-*-udi"

 gdb_test "finish" "The program is not running." "finish"
 #test forward-search
 # The message here comes from the regexp library, not gdb, and so can
 # vary on different systems.
 gdb_test "forward-search" "No previous regular expression.*|There is no previous regular expression.*" "forward-search"
 gdb_test "finish" "The program is not running." "finish"
 #test forward-search
 # The message here comes from the regexp library, not gdb, and so can
 # vary on different systems.
 gdb_test "forward-search" "No previous regular expression.*|There is no previous regular expression.*" "forward-search"

+#test gcore
+send_gdb "gcore\n"
+gdb_expect {
+    -re "You can\'t do that without a process to debug.*$gdb_prompt $" {
+       pass "gcore"
+    }
+    -re "Undefined command: .*$gdb_prompt $" {
+       pass "gcore"
+    }
+    default { fail "gcore" }
+}
+send_gdb "generate-core-file\n"
+gdb_expect {
+    -re "You can\'t do that without a process to debug.*$gdb_prompt $" {
+       pass "generate-core-file"
+    }
+    -re "Undefined command: .*$gdb_prompt $" {
+       pass "generate-core-file"
+    }
+    default { fail "generate-core-file" }
+}

 #test help "h" abbreviation
 #test help "h" abbreviation

-gdb_test "h" "List of classes of commands:.*\[\r\n\]+running -- Running the program.*\[\r\n\]+stack -- Examining the stack.*\[\r\n\]+data -- Examining data.*\[\r\n\]+breakpoints -- Making program stop at certain points.*\[\r\n\]+files -- Specifying and examining files.*\[\r\n\]+status -- Status inquiries.*\[\r\n\]+support -- Support facilities.*\[\r\n\]+user-defined -- User-defined commands.*\[\r\n\]+aliases -- Aliases of other commands.*\[\r\n\]+obscure -- Obscure features.*\[\r\n\]+Type \"help\" followed by a class name for a list of commands in that class..*\[\r\n\]+Type \"help\" followed by command name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "help \"h\" abbreviation"
+gdb_test "h" "List of classes of commands:(\[^\r\n\]*\[\r\n\])+aliases -- Aliases of other commands(\[^\r\n\]*\[\r\n\])+breakpoints -- Making program stop at certain points(\[^\r\n\]*\[\r\n\])+data -- Examining data(\[^\r\n\]*\[\r\n\])+files -- Specifying and examining files(\[^\r\n\]*\[\r\n\])+obscure -- Obscure features(\[^\r\n\]*\[\r\n\])+running -- Running the program(\[^\r\n\]*\[\r\n\])+stack -- Examining the stack(\[^\r\n\]*\[\r\n\])+status -- Status inquiries(\[^\r\n\]*\[\r\n\])+support -- Support facilities(\[^\r\n\]*\[\r\n\])+user-defined -- User-defined commands(\[^\r\n\]*\[\r\n\])+Type \"help\" followed by a class name for a list of commands in that class.(\[^\r\n\]*\[\r\n\])+Type \"help\" followed by command name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "help \"h\" abbreviation"

 #test help
 #test help

-gdb_test "help" "List of classes of commands:.*\[\r\n\]+running -- Running the program.*\[\r\n\]+stack -- Examining the stack.*\[\r\n\]+data -- Examining data.*\[\r\n\]+breakpoints -- Making program stop at certain points.*\[\r\n\]+files -- Specifying and examining files.*\[\r\n\]+status -- Status inquiries.*\[\r\n\]+support -- Support facilities.*\[\r\n\]+user-defined -- User-defined commands.*\[\r\n\]+aliases -- Aliases of other commands.*\[\r\n\]+obscure -- Obscure features.*\[\r\n\]+Type \"help\" followed by a class name for a list of commands in that class..*\[\r\n\]+Type \"help\" followed by command name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "help"
+gdb_test "help" "List of classes of commands:(\[^\r\n\]*\[\r\n\])+aliases -- Aliases of other commands(\[^\r\n\]*\[\r\n\])+breakpoints -- Making program stop at certain points(\[^\r\n\]*\[\r\n\])+data -- Examining data(\[^\r\n\]*\[\r\n\])+files -- Specifying and examining files(\[^\r\n\]*\[\r\n\])+obscure -- Obscure features(\[^\r\n\]*\[\r\n\])+running -- Running the program(\[^\r\n\]*\[\r\n\])+stack -- Examining the stack(\[^\r\n\]*\[\r\n\])+status -- Status inquiries(\[^\r\n\]*\[\r\n\])+support -- Support facilities(\[^\r\n\]*\[\r\n\])+user-defined -- User-defined commands(\[^\r\n\]*\[\r\n\])+Type \"help\" followed by a class name for a list of commands in that class.(\[^\r\n\]*\[\r\n\])+Type \"help\" followed by command name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "help"

 #test handle
 gdb_test "handle" "Argument required .signal to handle.*" "handle"
 #test info "i" abbreviation 
 #test handle
 gdb_test "handle" "Argument required .signal to handle.*" "handle"
 #test info "i" abbreviation 

-gdb_test "i" "\"info\" must be followed by the name of an info command..*\[\r\n\]+List of info subcommands:.*\[\r\n\]+Type \"help info\" followed by info subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "info \"i\" abbreviation"
+gdb_test "i" "\"info\" must be followed by the name of an info command.(\[^\r\n\]*\[\r\n\])+List of info subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help info\" followed by info subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "info \"i\" abbreviation"

 #test info
 #test info

-gdb_test "info" "\"info\" must be followed by the name of an info command..*\[\r\n\]+List of info subcommands:.*\[\r\n\]+Type \"help info\" followed by info subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "info"
+gdb_test "info" "\"info\" must be followed by the name of an info command.(\[^\r\n\]*\[\r\n\])+List of info subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help info\" followed by info subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "info"

 #test ignore
 gdb_test "ignore" "Argument required .a breakpoint number.*" "ignore"
 #test info address
 gdb_test "info address" "Argument required." "info address"
 #test info all-registers
 #test ignore
 gdb_test "ignore" "Argument required .a breakpoint number.*" "ignore"
 #test info address
 gdb_test "info address" "Argument required." "info address"
 #test info all-registers

-setup_xfail "a29k-*-udi"

 gdb_test "info all-registers" "The program has no registers now." "info all-registers"
 #test info args
 gdb_test "info args" "No frame selected." "info args"
 gdb_test "info all-registers" "The program has no registers now." "info all-registers"
 #test info args
 gdb_test "info args" "No frame selected." "info args"


@@ -253,7 +302,7 @@ gdb_test "info bogus-gdb-command" "Undefined info command: \"bogus-gdb-command\"
 #test info breakpoints
 gdb_test "info breakpoints" "No breakpoints or watchpoints." "info breakpoints"
 #test info catch
 #test info breakpoints
 gdb_test "info breakpoints" "No breakpoints or watchpoints." "info breakpoints"
 #test info catch

-gdb_test "info catch" "No frame selected." "info catch"
+gdb_test "info catch" "You can't do that without a process to debug." "info catch"

 #test info copying
 # FIXME -- doesn't work worth a shit
 #send_gdb "info copying"
 #test info copying
 # FIXME -- doesn't work worth a shit
 #send_gdb "info copying"


@@ -271,26 +320,25 @@ gdb_test "info frame" "No stack.|No selected frame." "info frame"
 #test info files
 gdb_test "info files" "" "info files"
 #test info float
 #test info files
 gdb_test "info files" "" "info files"
 #test info float

-gdb_test "info float" "No floating point info available for this processor." "info float"
+gdb_test "info float" "The program has no registers now." "info float"

 #test info functions
 gdb_test "info functions" "All defined functions:" "info functions"
 #test info locals
 gdb_test "info locals" "No frame selected." "info locals"
 #test info program
 #test info functions
 gdb_test "info functions" "All defined functions:" "info functions"
 #test info locals
 gdb_test "info locals" "No frame selected." "info locals"
 #test info program

-setup_xfail "a29k-*-udi"

 gdb_test "info program" "The program being debugged is not being run." "info program"
 #test info registers
 gdb_test "info program" "The program being debugged is not being run." "info program"
 #test info registers

-setup_xfail "a29k-*-udi"

 gdb_test "info registers" "The program has no registers now." "info registers"
 #test info stack "s" abbreviation
 gdb_test "info registers" "The program has no registers now." "info registers"
 #test info stack "s" abbreviation

-setup_xfail "a29k-*-udi"

 gdb_test "info s" "No stack." "info stack \"s\" abbreviation"
 #test info stack
 gdb_test "info s" "No stack." "info stack \"s\" abbreviation"
 #test info stack

-setup_xfail "a29k-*-udi"

 gdb_test "info stack" "No stack." "info stack"
 #test info set
 # FIXME -- needs to match the entire output
 gdb_test "info stack" "No stack." "info stack"
 #test info set
 # FIXME -- needs to match the entire output

-gdb_test "info set" "confirm:  Whether to confirm potentially dangerous operations is o\[a-z\]*..*\[\r\n\]+history filename:  The filename in which to record the command history is .*\[\r\n\]+listsize:  Number of source lines gdb will list by default is 10.*" "info set"
+# FIXME -- on native solaris 2.8, this test fails due to this line:
+#  prompt:  Gdb's prompt is "(gdb) ".^M
+gdb_test "info set" "confirm:  Whether to confirm potentially dangerous operations is o\[a-z\]*.(\[^\r\n\]*\[\r\n\])+history filename:  The filename in which to record the command history is (\[^\r\n\]*\[\r\n\])+listsize:  Number of source lines gdb will list by default is 10.*" "info set"
+gdb_test "info symbol" "Argument required .address.."

 #test info source
 gdb_test  "info source" "No current source file..*" "info source"
 #test info sources
 #test info source
 gdb_test  "info source" "No current source file..*" "info source"
 #test info sources


@@ -303,14 +351,15 @@ gdb_test "info terminal" "No saved terminal information." "info terminal"
 gdb_test "info types" "All defined types:" "info types"
 #test info variables
 gdb_test "info variables" "All defined variables:" "info variables"
 gdb_test "info types" "All defined types:" "info types"
 #test info variables
 gdb_test "info variables" "All defined variables:" "info variables"

+#test info vector
+gdb_test "info vector" "The program has no registers now." "info vector"

 #test info warranty
 #test info warranty

-gdb_test "info warranty" "NO WARRANTY.*\[\r\n\]+  *11.  *BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY.*\[\r\n\]+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN.*\[\r\n\]+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES.*\[\r\n\]+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED.*\[\r\n\]+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF.*\[\r\n\]+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS.*\[\r\n\]+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE.*\[\r\n\]+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,.*\[\r\n\]+REPAIR OR CORRECTION..*\[\r\n\]+  *12.  *IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING.*\[\r\n\]+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR.*\[\r\n\]+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,.*\[\r\n\]+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING.*\[\r\n\]+OUT OF THE USE OR INABILITY TO USE THE PROGRAM .INCLUDING BUT NOT LIMITED.*\[\r\n\]+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY.*\[\r\n\]+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER.*\[\r\n\]+PROGRAMS., EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE.*\[\r\n\]+POSSIBILITY OF SUCH DAMAGES.*" "info warranty"
+gdb_test "info warranty" "NO WARRANTY(\[^\r\n\]*\[\r\n\])+  *11.  *BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY(\[^\r\n\]*\[\r\n\])+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN(\[^\r\n\]*\[\r\n\])+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES(\[^\r\n\]*\[\r\n\])+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED(\[^\r\n\]*\[\r\n\])+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF(\[^\r\n\]*\[\r\n\])+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS(\[^\r\n\]*\[\r\n\])+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE(\[^\r\n\]*\[\r\n\])+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,(\[^\r\n\]*\[\r\n\])+REPAIR OR CORRECTION.(\[^\r\n\]*\[\r\n\])+  *12.  *IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING(\[^\r\n\]*\[\r\n\])+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR(\[^\r\n\]*\[\r\n\])+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,(\[^\r\n\]*\[\r\n\])+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING(\[^\r\n\]*\[\r\n\])+OUT OF THE USE OR INABILITY TO USE THE PROGRAM .INCLUDING BUT NOT LIMITED(\[^\r\n\]*\[\r\n\])+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY(\[^\r\n\]*\[\r\n\])+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER(\[^\r\n\]*\[\r\n\])+PROGRAMS., EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE(\[^\r\n\]*\[\r\n\])+POSSIBILITY OF SUCH DAMAGES.*" "info warranty"

 #test info watchpoints
 gdb_test "info watchpoints" "No breakpoints or watchpoints." "info watchpoints"
 #test inspect
 gdb_test "inspect" "The history is empty." "inspect"
 #test jump
 #test info watchpoints
 gdb_test "info watchpoints" "No breakpoints or watchpoints." "info watchpoints"
 #test inspect
 gdb_test "inspect" "The history is empty." "inspect"
 #test jump

-setup_xfail "a29k-*-udi"

 gdb_test "jump" "The program is not being run." "jump"
 #test kill
 gdb_test "kill" "The program is not being run." "kill"
 gdb_test "jump" "The program is not being run." "jump"
 #test kill
 gdb_test "kill" "The program is not being run." "kill"


@@ -324,19 +373,30 @@ gdb_test "list" "No symbol table is loaded.  Use the \"file\" command.*" "list"
 # to deduce the filename from the exec file.
 gdb_test "load" "You can't do that when your target is `None'.*|The load command takes a file name.*|Must specify at least a file name with the load command.*|.*Use the .file. or .exec-file. command.*" "load"
 #test next "n" abbreviation
 # to deduce the filename from the exec file.
 gdb_test "load" "You can't do that when your target is `None'.*|The load command takes a file name.*|Must specify at least a file name with the load command.*|.*Use the .file. or .exec-file. command.*" "load"
 #test next "n" abbreviation

-setup_xfail "a29k-*-udi"

 gdb_test "n" "The program is not being run." "next \"n\" abbreviation"
 #test next
 gdb_test "n" "The program is not being run." "next \"n\" abbreviation"
 #test next

-setup_xfail "a29k-*-udi"

 gdb_test "next" "The program is not being run." "next"
 #test nexti "ni" abbreviation
 gdb_test "next" "The program is not being run." "next"
 #test nexti "ni" abbreviation

-setup_xfail "a29k-*-udi"

 gdb_test "ni" "The program is not being run." "nexti \"ni\" abbreviation"
 #test nexti
 gdb_test "ni" "The program is not being run." "nexti \"ni\" abbreviation"
 #test nexti

-setup_xfail "a29k-*-udi"

 gdb_test "nexti" "The program is not being run." "nexti"
 #test output
 gdb_test "output" "Argument required .expression to compute.*" "output"
 gdb_test "nexti" "The program is not being run." "nexti"
 #test output
 gdb_test "output" "Argument required .expression to compute.*" "output"

+
+#test overlay
+gdb_test "overlay" "\"overlay\" must be followed by the name of .*"
+#test a non-existant overlay subcommand
+gdb_test "overlay on"     "Undefined overlay command.* Try \"help overlay\"."
+gdb_test "overlay manual" "" "overlay manual #1"
+gdb_test "overlay auto"   ""
+gdb_test "overlay off"    ""
+gdb_test "overlay list"   "No sections are mapped."
+gdb_test "overlay map"    "Overlay debugging not enabled.*" "overlay map #1"
+gdb_test "overlay unmap"  "Overlay debugging not enabled.*" "overlay unmap #1"
+gdb_test "overlay manual" "" "overlay manual #2"
+gdb_test "overlay map"    "Argument required: name of an overlay section." "overlay map #2"
+gdb_test "overlay unmap"  "Argument required: name of an overlay section." "overlay unmap #2"
+

 #test print "p" abbreviation
 gdb_test "p" "The history is empty." "print \"p\" abbreviation"
 #test print
 #test print "p" abbreviation
 gdb_test "p" "The history is empty." "print \"p\" abbreviation"
 #test print


@@ -359,7 +419,7 @@ You must specify a function name to run, and arguments if any"\
 
 } else {
     send_gdb "r\n"
 
 } else {
     send_gdb "r\n"

-    expect {
+    gdb_expect {

            -re "Starting program:  .*
 You can't do that when your target is `None'.*$gdb_prompt $"\
                        { pass "run \"r\" abbreviation" }
            -re "Starting program:  .*
 You can't do that when your target is `None'.*$gdb_prompt $"\
                        { pass "run \"r\" abbreviation" }


@@ -368,6 +428,9 @@ No executable file specified.*
 Use the \"file\" or \"exec-file\" command.*$gdb_prompt $"\
                        { pass "run \"r\" abbreviation" }
            -re "Starting program:  .*
 Use the \"file\" or \"exec-file\" command.*$gdb_prompt $"\
                        { pass "run \"r\" abbreviation" }
            -re "Starting program:  .*

+No executable specified, use .target exec.\\..*$gdb_prompt $"\
+                       { pass "run \"r\" abbreviation" }
+           -re "Starting program:  .*

 No image loaded into target.*$gdb_prompt $"\
                        { pass "run \"r\" abbreviation" }
            -re "Starting program:  .*
 No image loaded into target.*$gdb_prompt $"\
                        { pass "run \"r\" abbreviation" }
            -re "Starting program:  .*


@@ -390,13 +453,16 @@ You must specify a function name to run, and arguments if any"
 
 } else {
     send_gdb "run\n"
 
 } else {
     send_gdb "run\n"

-    expect {
+    gdb_expect {

            -re "Starting program:.*You can't do that when your target is `None'.*$gdb_prompt $" { pass "run" }
            -re "Starting program:  .*
 No executable file specified.*
 Use the \"file\" or \"exec-file\" command.*$gdb_prompt $"\
                        { pass "run" }
            -re "Starting program:  .*
            -re "Starting program:.*You can't do that when your target is `None'.*$gdb_prompt $" { pass "run" }
            -re "Starting program:  .*
 No executable file specified.*
 Use the \"file\" or \"exec-file\" command.*$gdb_prompt $"\
                        { pass "run" }
            -re "Starting program:  .*

+No executable specified, use .target exec.\\..*$gdb_prompt $"\
+                       { pass "run" }
+           -re "Starting program:  .*

 No image loaded into target.*$gdb_prompt $"\
                        { pass "run" }
            -re "Starting program:  .*
 No image loaded into target.*$gdb_prompt $"\
                        { pass "run" }
            -re "Starting program:  .*


@@ -412,20 +478,21 @@ No program loaded.*$gdb_prompt $"\
 #test rbreak
 gdb_test "rbreak" "" "rbreak"
 
 #test rbreak
 gdb_test "rbreak" "" "rbreak"
 

+# test restore
+gdb_test "restore" "You can't do that without a process to debug\."
+

 #test return
 #test return

-# The middle case accommodates the a29k, where doing the "ni" above causes
-# an initial stack to be created.
+# The middle case accomodated the obsolete a29k, where doing the "ni"
+# above causes an initial stack to be created.

 gdb_test "return" "No selected frame..*" "return"  "Make .* return now.*y or n. $" "y"
 
 
 #test reverse-search
 gdb_test "reverse-search" "No previous regular expression.*|There is no previous regular expression.*" "reverse-search"
 #test step "s" abbreviation
 gdb_test "return" "No selected frame..*" "return"  "Make .* return now.*y or n. $" "y"
 
 
 #test reverse-search
 gdb_test "reverse-search" "No previous regular expression.*|There is no previous regular expression.*" "reverse-search"
 #test step "s" abbreviation

-setup_xfail "a29k-*-udi"
-gdb_test "s" "The program is not being run." "step \"s\" abbreviation"
+gdb_test "s" "The program is not being run." "step \"s\" abbreviation #1"

 #test step
 #test step

-setup_xfail "a29k-*-udi"
-gdb_test "step" "The program is not being run." "step"
+gdb_test "step" "The program is not being run." "step #1"

 #test search
 gdb_test "search" "No previous regular expression.*|There is no previous regular expression.*" "search"
 #test section
 #test search
 gdb_test "search" "No previous regular expression.*|There is no previous regular expression.*" "search"
 #test section


@@ -435,11 +502,11 @@ gdb_test "set annotate" "Argument required .integer to set it to.*" "set annotat
 #test set args
 gdb_test "set args" "" "set args"
 #test set check "c" abbreviation
 #test set args
 gdb_test "set args" "" "set args"
 #test set check "c" abbreviation

-gdb_test "set c" "\"set check\" must be followed by the name of a check subcommand..*\[\r\n\]+List of set check subcommands:.*\[\r\n\]+set check range -- Set range checking.*\[\r\n\]+set check type -- Set type checking.*\[\r\n\]+Type \"help set check\" followed by set check subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "set check \"c\" abbreviation"
+gdb_test "set c" "\"set check\" must be followed by the name of a check subcommand.(\[^\r\n\]*\[\r\n\])+List of set check subcommands:(\[^\r\n\]*\[\r\n\])+set check range -- Set range checking(\[^\r\n\]*\[\r\n\])+set check type -- Set type checking(\[^\r\n\]*\[\r\n\])+Type \"help set check\" followed by set check subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set check \"c\" abbreviation"

 #test set check "ch" abbreviation
 #test set check "ch" abbreviation

-gdb_test "set ch" "\"set check\" must be followed by the name of a check subcommand..*\[\r\n\]+List of set check subcommands:.*\[\r\n\]+set check range -- Set range checking.*\[\r\n\]+set check type -- Set type checking.*\[\r\n\]+Type \"help set check\" followed by set check subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "set check \"ch\" abbreviation"
+gdb_test "set ch" "\"set check\" must be followed by the name of a check subcommand.(\[^\r\n\]*\[\r\n\])+List of set check subcommands:(\[^\r\n\]*\[\r\n\])+set check range -- Set range checking(\[^\r\n\]*\[\r\n\])+set check type -- Set type checking(\[^\r\n\]*\[\r\n\])+Type \"help set check\" followed by set check subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set check \"ch\" abbreviation"

 #test set check
 #test set check

-gdb_test "set check" "\"set check\" must be followed by the name of a check subcommand..*\[\r\n\]+List of set check subcommands:.*\[\r\n\]+set check range -- Set range checking.*\[\r\n\]+set check type -- Set type checking.*\[\r\n\]+Type \"help set check\" followed by set check subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "set check"
+gdb_test "set check" "\"set check\" must be followed by the name of a check subcommand.(\[^\r\n\]*\[\r\n\])+List of set check subcommands:(\[^\r\n\]*\[\r\n\])+set check range -- Set range checking(\[^\r\n\]*\[\r\n\])+set check type -- Set type checking(\[^\r\n\]*\[\r\n\])+Type \"help set check\" followed by set check subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set check"

 #test set check range
 gdb_test "set check range" "" "set check range"
 #test set check type
 #test set check range
 gdb_test "set check range" "" "set check range"
 #test set check type


@@ -465,17 +532,17 @@ gdb_test "set history save" "" "set history save"
 #test set history size
 gdb_test "set history size" "Argument required .integer to set it to.*" "set history size"
 #test set history
 #test set history size
 gdb_test "set history size" "Argument required .integer to set it to.*" "set history size"
 #test set history

-gdb_test "set history" "\"set history\" must be followed by the name of a history subcommand..*\[\r\n\]+List of set history subcommands:.*\[\r\n\]+set history filename -- Set the filename in which to record the command history.*\[\r\n\]+set history size -- Set the size of the command history.*\[\r\n\]+set history save -- Set saving of the history record on exit.*\[\r\n\]+set history expansion -- Set history expansion on command input.*\[\r\n\]+Type \"help set history\" followed by set history subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "set history"
+gdb_test "set history" "\"set history\" must be followed by the name of a history subcommand.(\[^\r\n\]*\[\r\n\])+List of set history subcommands:(\[^\r\n\]*\[\r\n\])+set history expansion -- Set history expansion on command input(\[^\r\n\]*\[\r\n\])+set history filename -- Set the filename in which to record the command history(\[^\r\n\]*\[\r\n\])+set history save -- Set saving of the history record on exit(\[^\r\n\]*\[\r\n\])+set history size -- Set the size of the command history(\[^\r\n\]*\[\r\n\])+Type \"help set history\" followed by set history subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set history"

 #test set language
 #test set language

-gdb_test "set language" "The currently understood settings are:.*\[\r\n\]+local or auto  *Automatic setting based on source file.*\[\r\n\]+c  *Use the C language.*\[\r\n\]+c\[+\]+  *Use the C\[+\]+ language.*\[\r\n\]+modula-2  *Use the Modula-2 language.*" "set language"
+gdb_test "set language" "The currently understood settings are:(\[^\r\n\]*\[\r\n\])+local or auto  *Automatic setting based on source file(\[^\r\n\]*\[\r\n\])+c  *Use the C language(\[^\r\n\]*\[\r\n\])+c\[+\]+  *Use the C\[+\]+ language(\[^\r\n\]*\[\r\n\])+modula-2  *Use the Modula-2 language.*" "set language"

 #test set listsize
 gdb_test "set listsize" "Argument required .integer to set it to.*" "set listsize"
 #test set print "p" abbreviation
 #test set listsize
 gdb_test "set listsize" "Argument required .integer to set it to.*" "set listsize"
 #test set print "p" abbreviation

-gdb_test "set p" "\"set print\" must be followed by the name of a print subcommand..*\[\r\n\]+List of set print subcommands:.*\[\r\n\]+Type \"help set print\" followed by set print subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "set print \"p\" abbreviation"
+gdb_test "set p" "\"set print\" must be followed by the name of a print subcommand.(\[^\r\n\]*\[\r\n\])+List of set print subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help set print\" followed by set print subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set print \"p\" abbreviation"

 #test set print "pr" abbreviation
 #test set print "pr" abbreviation

-gdb_test "set pr" "\"set print\" must be followed by the name of a print subcommand..*\[\r\n\]+List of set print subcommands:.*\[\r\n\]+Type \"help set print\" followed by set print subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "set print \"pr\" abbreviation"
+gdb_test "set pr" "\"set print\" must be followed by the name of a print subcommand.(\[^\r\n\]*\[\r\n\])+List of set print subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help set print\" followed by set print subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set print \"pr\" abbreviation"

 #test set print
 #test set print

-gdb_test "set print" "\"set print\" must be followed by the name of a print subcommand..*\[\r\n\]+List of set print subcommands:.*\[\r\n\]+Type \"help set print\" followed by set print subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "set print"
+gdb_test "set print" "\"set print\" must be followed by the name of a print subcommand.(\[^\r\n\]*\[\r\n\])+List of set print subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help set print\" followed by set print subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set print"

 #test set print address
 gdb_test "set print address" "" "set print address"
 #test set print array
 #test set print address
 gdb_test "set print address" "" "set print address"
 #test set print array


@@ -517,13 +584,13 @@ gdb_test "shell echo Hi dad!" "Hi dad!" "shell echo Hi dad!"
 #test show annotate
 gdb_test "show annotate" "Annotation_level is 0."       "show annotate"
 #test show args
 #test show annotate
 gdb_test "show annotate" "Annotation_level is 0."       "show annotate"
 #test show args

-gdb_test "show args" "Arguments to give program being debugged when it is started is \"\"." "show args"
+gdb_test "show args" "Argument list to give program being debugged when it is started is \"\"." "show args"

 #test show check "c" abbreviation
 #test show check "c" abbreviation

-gdb_test "show c" "range:  *Range checking is \"auto; currently off\"..*\[\r\n\]+type:  *Type checking is \"auto; currently off\".*" "show check \"c\" abbreviation"
+gdb_test "show c" "range:  *Range checking is \"auto; currently off\".(\[^\r\n\]*\[\r\n\])+type:  *Type checking is \"auto; currently off\".*" "show check \"c\" abbreviation"

 #test show check "ch" abbreviation
 #test show check "ch" abbreviation

-gdb_test "show ch" "range: *Range checking is \"auto; currently off\"..*\[\r\n\]+type:  *Type checking is \"auto; currently off\"." "show check \"ch\" abbreviation"
+gdb_test "show ch" "range: *Range checking is \"auto; currently off\".(\[^\r\n\]*\[\r\n\])+type:  *Type checking is \"auto; currently off\"." "show check \"ch\" abbreviation"

 #test show check
 #test show check

-gdb_test "show check" "range:  *Range checking is \"auto; currently off\"..*\[\r\n\]+type:  *Type checking is \"auto; currently off\"." "show check"
+gdb_test "show check" "range:  *Range checking is \"auto; currently off\".(\[^\r\n\]*\[\r\n\])+type:  *Type checking is \"auto; currently off\"." "show check"

 #test show check range
 gdb_test "show check range" "Range checking is \"auto; currently off\"." "show check range"
 #test show check type
 #test show check range
 gdb_test "show check range" "Range checking is \"auto; currently off\"." "show check range"
 #test show check type


@@ -535,7 +602,7 @@ gdb_test "show complaints" "Max number of complaints about incorrect symbols is
 #test show confirm
 gdb_test "show confirm" "Whether to confirm potentially dangerous operations is o\[a-z\]*." "show confirm"
 #test show convenience
 #test show confirm
 gdb_test "show confirm" "Whether to confirm potentially dangerous operations is o\[a-z\]*." "show confirm"
 #test show convenience

-gdb_test "show convenience" "No debugger convenience variables now defined..*\[\r\n\]+Convenience variables have names starting with \".\";.*\[\r\n\]+use \"set\" as in \"set .foo = 5\" to define them." "show convenience"
+gdb_test "show convenience" "No debugger convenience variables now defined.(\[^\r\n\]*\[\r\n\])+Convenience variables have names starting with \".\";(\[^\r\n\]*\[\r\n\])+use \"set\" as in \"set .foo = 5\" to define them." "show convenience"

 #test show directories
 gdb_test "show directories" "Source directories searched: .cdir:.cwd" "show directories"
 #test show editing
 #test show directories
 gdb_test "show directories" "Source directories searched: .cdir:.cwd" "show directories"
 #test show editing


@@ -551,7 +618,7 @@ gdb_test "show history save" "Saving of the history record on exit is on." "show
 #test show history size
 gdb_test "show history size" "The size of the command history is.*" "show history size"
 #test show history
 #test show history size
 gdb_test "show history size" "The size of the command history is.*" "show history size"
 #test show history

-gdb_test "show history" "filename:  *The filename in which to record the command history is.*.gdb_history.*\[\r\n\]+size: * The size of the command history is.*\[\r\n\]+save: *Saving of the history record on exit is o.*\[\r\n\]+expansion:  *History expansion on command input is o.*" "show history"
+gdb_test "show history" "expansion:  *History expansion on command input is o(\[^\r\n\]*\[\r\n\])+filename:  *The filename in which to record the command history is.*.gdb_history(\[^\r\n\]*\[\r\n\])+save: *Saving of the history record on exit is o(\[^\r\n\]*\[\r\n\])+size: * The size of the command history is.*" "show history"

 #test show language
 gdb_test "show language" "The current source language is \"auto; currently c\"." "show language"
 #test show listsize
 #test show language
 gdb_test "show language" "The current source language is \"auto; currently c\"." "show language"
 #test show listsize


@@ -569,9 +636,9 @@ gdb_test "show print address" "Printing of addresses is on." "show print address
 #test show print array
 gdb_test "show print array" "Prettyprinting of arrays is on." "show print array"
 #test show print asm-demangle
 #test show print array
 gdb_test "show print array" "Prettyprinting of arrays is on." "show print array"
 #test show print asm-demangle

-gdb_test "show print asm-demangle" "Demangling of C\[+\]+ names in disassembly listings is on." "show print asm-demangle"
+gdb_test "show print asm-demangle" "Demangling of C\[+\]+/ObjC names in disassembly listings is on." "show print asm-demangle"

 #test show print demangle
 #test show print demangle

-gdb_test "show print demangle" "Demangling of encoded C\[+\]+ names when displaying symbols is on." "show print demangle"
+gdb_test "show print demangle" "Demangling of encoded C\[+\]+/ObjC names when displaying symbols is on." "show print demangle"

 #test show print elements
 gdb_test "show print elements" "Limit on string chars or array elements to print is 200." "show print elements"
 #test show print object
 #test show print elements
 gdb_test "show print elements" "Limit on string chars or array elements to print is 200." "show print elements"
 #test show print object


@@ -600,32 +667,26 @@ gdb_test "show values" "" "show values"
 #test show verbose
 gdb_test "show verbose" "Verbose printing of informational messages is o.*|Verbosity is off.*" "show verbose"
 #test show version
 #test show verbose
 gdb_test "show verbose" "Verbose printing of informational messages is o.*|Verbosity is off.*" "show verbose"
 #test show version

-
-gdb_test "show version" "GNU gdb \[0-9\.\]*.*\[\r\n\]+Copyright \[0-9\]* Free Software Foundation, Inc.*\[\r\n\]+GDB is free software, covered by the GNU General Public License, and you are.*\[\r\n\]+welcome to change it and/or distribute copies of it under certain conditions.*\[\r\n\]+Type \"show copying\" to see the conditions.*\[\r\n\]+There is absolutely no warranty for GDB.  Type \"show warranty\" for details.*\[\r\n\]+This GDB was configured as .*|GDB is free software and you are welcome to distribute copies of it.*\[\r\n\]+ under certain conditions; type \"show copying\" to see the conditions..*\[\r\n\]+There is absolutely no warranty for GDB; type \"show warranty\" for details..*\[\r\n\]+GDB.*Copyright \[0-9\]* Free Software Foundation, Inc.*" "show version"
+gdb_test "show version" "GNU gdb \[0-9\.\]*(\[^\r\n\]*\[\r\n\])+Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc(\[^\r\n\]*\[\r\n\])+GDB is free software, covered by the GNU General Public License, and you are(\[^\r\n\]*\[\r\n\])+welcome to change it and/or distribute copies of it under certain conditions(\[^\r\n\]*\[\r\n\])+Type \"show copying\" to see the conditions(\[^\r\n\]*\[\r\n\])+There is absolutely no warranty for GDB.  Type \"show warranty\" for details(\[^\r\n\]*\[\r\n\])+This GDB was configured as .*|GDB is free software and you are welcome to distribute copies of it(\[^\r\n\]*\[\r\n\])+ under certain conditions; type \"show copying\" to see the conditions.(\[^\r\n\]*\[\r\n\])+There is absolutely no warranty for GDB; type \"show warranty\" for details.(\[^\r\n\]*\[\r\n\])+GDB.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*" "show version"

 #test show width
 gdb_test "show width" "Number of characters gdb thinks are in a line is.*" "show width"
 #test show write
 # This is only supported on targets which use exec.o.
 gdb_test "show write" "Writing into executable and core files is o.*" "show write"
 #test show
 #test show width
 gdb_test "show width" "Number of characters gdb thinks are in a line is.*" "show width"
 #test show write
 # This is only supported on targets which use exec.o.
 gdb_test "show write" "Writing into executable and core files is o.*" "show write"
 #test show

-gdb_test "show" "confirm:  *Whether to confirm potentially dangerous operations is on..*\[\r\n\]+history filename:  *The filename in which to record the command history is .*\[\r\n\]+history size:  *The size of the command history is.*\[\r\n\]+history save:  *Saving of the history record on exit is on..*\[\r\n\]+print elements:  *Limit on string chars or array elements to print is 200..*\[\r\n\]+listsize:  *Number of source lines gdb will list by default is 10.*" "show"
+gdb_test "show" "confirm:  *Whether to confirm potentially dangerous operations is on.(\[^\r\n\]*\[\r\n\])+history filename:  *The filename in which to record the command history is (\[^\r\n\]*\[\r\n\])+history save:  *Saving of the history record on exit is on.(\[^\r\n\]*\[\r\n\])+history size:  *The size of the command history is(\[^\r\n\]*\[\r\n\])+listsize:  *Number of source lines gdb will list by default is 10(\[^\r\n]*\[\r\n\])+print elements:  *Limit on string chars or array elements to print is 200..*" "show"

 #test stepi "si" abbreviation
 #test stepi "si" abbreviation

-setup_xfail "a29k-*-udi"

 gdb_test  "si" "The program is not being run." "stepi \"si\" abbreviation"
 #test stepi
 gdb_test  "si" "The program is not being run." "stepi \"si\" abbreviation"
 #test stepi

-setup_xfail "a29k-*-udi"

 gdb_test "stepi" "The program is not being run." "stepi"
 #test signal
 gdb_test "stepi" "The program is not being run." "stepi"
 #test signal

-setup_xfail "a29k-*-udi"

 gdb_test "signal" "The program is not being run." "signal"
 #test source
 gdb_test "source" "source command requires pathname of file to source..*|No such file or directory.*" "source"
 #test step "s" abbreviation
 gdb_test "signal" "The program is not being run." "signal"
 #test source
 gdb_test "source" "source command requires pathname of file to source..*|No such file or directory.*" "source"
 #test step "s" abbreviation

-setup_xfail "a29k-*-udi"
-gdb_test "s" "The program is not being run." "step \"s\" abbreviation"
+gdb_test "s" "The program is not being run." "step \"s\" abbreviation #2"

 #test step
 #test step

-setup_xfail "a29k-*-udi"
-gdb_test "step" "The program is not being run." "step"
+gdb_test "step" "The program is not being run." "step #2"

 #test symbol-file
 gdb_test "symbol-file" "" "symbol-file"
 
 #test symbol-file
 gdb_test "symbol-file" "" "symbol-file"
 


@@ -637,14 +698,14 @@ gdb_test "target procfs" "Use the \"run\" command to start a Unix child process.
 
 #test target core
 send_gdb "target core\n"
 
 #test target core
 send_gdb "target core\n"

-expect {
+gdb_expect {

     -re "No core file specified..*$gdb_prompt $" { pass "target core" }
     -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
        send_gdb "n\n"
        if $verbose>1 then {
            send_user "\t\tDidn't kill program being debugged\n"
        }
     -re "No core file specified..*$gdb_prompt $" { pass "target core" }
     -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
        send_gdb "n\n"
        if $verbose>1 then {
            send_user "\t\tDidn't kill program being debugged\n"
        }

-       expect -re "$gdb_prompt $" { }
+       gdb_expect -re "$gdb_prompt $" { }

        pass "target core"
     }
     -re "Undefined target command: \"core\".  Try \"help target\"..*$gdb_prompt $" { pass "target core" }
        pass "target core"
     }
     -re "Undefined target command: \"core\".  Try \"help target\"..*$gdb_prompt $" { pass "target core" }


@@ -654,15 +715,15 @@ expect {
 
 #test target exec
 send_gdb "target exec\n"
 
 #test target exec
 send_gdb "target exec\n"

-expect {
-       -re "No exec file now..*$gdb_prompt $"\
+gdb_expect {
+       -re "No executable file now..*$gdb_prompt $"\

                        { pass "target exec" }
        -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
            send_gdb "n\n"
            if $verbose>1 then {
                send_user "\t\tDidn't kill program being debugged\n"
            }
                        { pass "target exec" }
        -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
            send_gdb "n\n"
            if $verbose>1 then {
                send_user "\t\tDidn't kill program being debugged\n"
            }

-           expect -re "$gdb_prompt $" { }
+           gdb_expect -re "$gdb_prompt $" { }

            pass "target exec"
        }
        -re ".*$gdb_prompt $"   { fail "target exec" }
            pass "target exec"
        }
        -re ".*$gdb_prompt $"   { fail "target exec" }


@@ -672,16 +733,15 @@ expect {
 #test target remote
 if ![istarget "*-*-udi*"] then {
     send_gdb "target remote\n"
 #test target remote
 if ![istarget "*-*-udi*"] then {
     send_gdb "target remote\n"

-    expect {
-       -re "To open a remote debug connection, you need to specify what serial.*
-device is attached to the remote system .e.g. /dev/ttya.*$gdb_prompt $"\
+    gdb_expect {
+       -re "To open a remote debug connection, you need to specify what.*serial.*device is attached to the remote system.*.e.g. .*$gdb_prompt $"\

                        { pass "target remote" }
        -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
            send_gdb "n\n"
            if $verbose>1 then {
                send_user "\t\tDidn't kill program being debugged\n"
            }
                        { pass "target remote" }
        -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
            send_gdb "n\n"
            if $verbose>1 then {
                send_user "\t\tDidn't kill program being debugged\n"
            }

-           expect -re "$gdb_prompt $" { }
+           gdb_expect -re "$gdb_prompt $" { }

            pass "target remote"
        }
        -re ".*$gdb_prompt $"   { fail "target remote" }
            pass "target remote"
        }
        -re ".*$gdb_prompt $"   { fail "target remote" }


@@ -694,20 +754,18 @@ gdb_test "target" "Argument required .target name.*" "target"
 #test tbreak
 gdb_test "tbreak" "No default breakpoint address now." "tbreak"
 #test tty
 #test tbreak
 gdb_test "tbreak" "No default breakpoint address now." "tbreak"
 #test tty

-gdb_test "tty" "Argument required .terminal name for running target process.*" "tty"
+gdb_test "tty" "Argument required .filename to set it to\..*" "tty"

 #test until "u" abbreviation
 #test until "u" abbreviation

-setup_xfail "a29k-*-udi"

 gdb_test "u" "The program is not running." "until \"u\" abbreviation"
 #test until
 gdb_test "u" "The program is not running." "until \"u\" abbreviation"
 #test until

-setup_xfail "a29k-*-udi"

 gdb_test "until" "The program is not running." "until"
 #test undisplay
 # FIXME -- need to dump full output to detailed log
 send_gdb "undisplay\n"
 gdb_test "until" "The program is not running." "until"
 #test undisplay
 # FIXME -- need to dump full output to detailed log
 send_gdb "undisplay\n"

-expect {
+gdb_expect {

     -re "Delete all auto-display expressions.*y or n. $" {
        send_gdb "y\n"
     -re "Delete all auto-display expressions.*y or n. $" {
        send_gdb "y\n"

-       expect {
+       gdb_expect {

            -re "$gdb_prompt $" { pass "undisplay prompt" }
            timeout { fail "(timeout) (timeout) undisplay prompt"    }
        }
            -re "$gdb_prompt $" { pass "undisplay prompt" }
            timeout { fail "(timeout) (timeout) undisplay prompt"    }
        }


@@ -717,10 +775,10 @@ expect {
 
 #test unset environment
 send_gdb "unset environment\n"
 
 #test unset environment
 send_gdb "unset environment\n"

-expect {
+gdb_expect {

     -re "Delete all environment variables?.*y or n. $" { 
        send_gdb "y\n"
     -re "Delete all environment variables?.*y or n. $" { 
        send_gdb "y\n"

-       expect {
+       gdb_expect {

            -re "$gdb_prompt $" { pass "unset environmentprompt" }
            timeout {
                fail "(timeout) (timeout) unset environment prompt"
            -re "$gdb_prompt $" { pass "unset environmentprompt" }
            timeout {
                fail "(timeout) (timeout) unset environment prompt"


@@ -733,7 +791,7 @@ expect {
 }
 
 #test unset
 }
 
 #test unset

-gdb_test "unset" "\"unset\" must be followed by the name of an unset subcommand..*\[\r\n\]+List of unset subcommands:.*\[\r\n\]+unset environment -- Cancel environment variable VAR for the program.*\[\r\n\]+Type \"help unset\" followed by unset subcommand name for full documentation..*\[\r\n\]+Command name abbreviations are allowed if unambiguous." "unset"
+gdb_test "unset" "\"unset\" must be followed by the name of an unset subcommand.(\[^\r\n\]*\[\r\n\])+List of unset subcommands:(\[^\r\n\]*\[\r\n\])+unset environment -- Cancel environment variable VAR for the program(\[^\r\n\]*\[\r\n\])+Type \"help unset\" followed by unset subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "unset"

 #test up
 #test up-silently
 gdb_test "up-silently" "No stack." "up-silently"
 #test up
 #test up-silently
 gdb_test "up-silently" "No stack." "up-silently"


@@ -742,10 +800,19 @@ gdb_test "watch" "Argument required .expression to compute.*" "watch"
 #test whatis
 gdb_test "whatis" "The history is empty." "whatis"
 #test where
 #test whatis
 gdb_test "whatis" "The history is empty." "whatis"
 #test where

-setup_xfail "a29k-*-udi"

 gdb_test "where" "No stack." "where"
 #test x
 #The case in which it prints a number is for vxgdb.
 gdb_test "where" "No stack." "where"
 #test x
 #The case in which it prints a number is for vxgdb.

-gdb_test "x" "0x0:.*0x\[0-9\]*|0x0:.*Cannot access memory at address 0x0." "x"
+send_gdb "x\n"
+gdb_expect {
+    -re "0x0:.*Cannot access memory at address 0x0..*$gdb_prompt $" {
+        pass "x"
+    }
+    -re "0x0:.*Error accessing memory address 0x0:.*$gdb_prompt $" {
+        pass "x"
+    }
+    -re ".*$gdb_prompt $" { fail "x" }
+    timeout { fail "(timeout) x" }
+}

 
 gdb_exit
 
 gdb_exit