X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.base%2Fcompletion.exp;h=879743160f6f9cd695f691bd52a25a5eacba3c26;hb=0fb0cc7590113e9b459dfcc48dc71c9d419d9580;hp=2961cb5ac1acce9099768fa42a562f163c07d748;hpb=01f0fe5e0450edf168c1f612feb93cf588e4e7ea;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index 2961cb5ac1..879743160f 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -1,21 +1,18 @@ -# Copyright 1998, 1999, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright 1998, 1999, 2002, 2003, 2004, 2007, 2008, 2009 +# 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 +# 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, 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: -# bug-gdb@prep.ai.mit.edu +# along with this program. If not, see . # This file was written by Elena Zannoni (ezannoni@cygnus.com) @@ -41,8 +38,8 @@ # "p \"break1" unambiguous (completes to filename "break1.c") # "p \"break1." unambiguous (should complete to "break1.c" but does not, # due to readline limitations) -# "p 'a" ambiguous (all symbols starting with a) -# "p b-a" ambiguous (all symbols starting with a) +# "p 'arg" ambiguous (all symbols starting with arg) +# "p b-arg" ambiguous (all symbols starting with arg) # "p b-" ambiguous (all symbols) # "file Make" "file" (word break hard to screw up here) # "file ../gdb.stabs/we" "ird" (needs to not break word at slash) @@ -68,15 +65,18 @@ set srcfile1 ${testfile}1.c set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } { - gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." + untested completion.exp + return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } { - gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." + untested completion.exp + return -1 } if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } { - gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." + untested completion.exp + return -1 } if [get_compiler_info ${binfile}] { @@ -223,7 +223,7 @@ gdb_expect { -re "^info t foo\\\x07$"\ { send_gdb "\n" gdb_expect { - -re "Ambiguous info command \"t foo\": target, terminal, threads, tp, tracepoints, types\\..*$gdb_prompt $"\ + -re "Ambiguous info command \"t foo\": target, tasks, terminal, threads, tp, tracepoints, types\\..*$gdb_prompt $"\ { pass "complete 'info t foo'"} -re ".*$gdb_prompt $" { fail "complete 'info t foo'"} timeout {fail "(timeout) complete 'info t foo'"} @@ -239,7 +239,7 @@ gdb_expect { -re "^info t\\\x07$"\ { send_gdb "\n" gdb_expect { - -re "Ambiguous info command \"t\": target, terminal, threads, tp, tracepoints, types\\.. + -re "Ambiguous info command \"t\": target, tasks, terminal, threads, tp, tracepoints, types\\.. *$gdb_prompt $"\ { pass "complete 'info t'"} -re ".*$gdb_prompt $" { fail "complete 'info t'"} @@ -257,7 +257,7 @@ gdb_expect { -re "^info t \\\x07$"\ { send_gdb "\n" gdb_expect { - -re "Ambiguous info command \"t \": target, terminal, threads, tp, tracepoints, types\\.. + -re "Ambiguous info command \"t \": target, tasks, terminal, threads, tp, tracepoints, types\\.. *$gdb_prompt $"\ { pass "complete 'info t '"} -re ".*$gdb_prompt $" { fail "complete 'info t '"} @@ -310,7 +310,7 @@ gdb_expect { -re "^info $"\ { send_gdb "\n" gdb_expect { - -re "\"info\" must be followed by the name of an info command\\.\r\nList of info subcommands:\r\n\r\n.*info address.*info watchpoints.*\r\n\r\nType \"help info\" followed by info subcommand name for full documentation.\r\nCommand name abbreviations are allowed if unambiguous\\..*$gdb_prompt $"\ + -re "\"info\" must be followed by the name of an info command\\.\r\nList of info subcommands.*$gdb_prompt $"\ { pass "complete 'info'"} -re ".*$gdb_prompt $" { fail "complete 'info'"} timeout {fail "(timeout) complete 'info'"} @@ -326,7 +326,7 @@ gdb_expect { -re "^info \\\x07$"\ { send_gdb "\n" gdb_expect { - -re "\"info\" must be followed by the name of an info command\\.\r\nList of info subcommands:\r\n\r\n.*info address.*Type \"help info\" followed by info subcommand name for full documentation.\r\nCommand name abbreviations are allowed if unambiguous\\..*$gdb_prompt $"\ + -re "\"info\" must be followed by the name of an info command\\.\r\nList of info subcommands:\r\n\r\n.*$gdb_prompt $"\ { pass "complete 'info '"} -re ".*$gdb_prompt $" { fail "complete 'info '"} timeout {fail "(timeout) complete 'info '"} @@ -361,6 +361,23 @@ gdb_expect { } +send_gdb "help info wat\t" +gdb_expect { + -re "^help info watchpoints $"\ + { send_gdb "\n" + gdb_expect { + -re "Synonym for .*\r\n.*$gdb_prompt $"\ + { pass "complete help info wat" } + -re ".*$gdb_prompt $" { fail "complete help info wat"} + timeout {fail "(timeout) complete help info wat"} + } + } + -re "^help info wat\\\x07$" { fail "complete (2) help info wat" } + -re ".*$gdb_prompt $" { fail "complete (3) help info wat" } + timeout { fail "(timeout) complete (3) help info wat" } + } + + send_gdb "p \"break1\t" sleep 1 gdb_expect { @@ -418,63 +435,63 @@ gdb_expect { timeout { fail "(timeout) complete 'p \"break1.'" } } -send_gdb "p 'a\t" +send_gdb "p 'arg\t" sleep 1 gdb_expect { - -re "^p 'a\\\x07$"\ + -re "^p 'arg\\\x07$"\ { send_gdb "\n" gdb_expect { -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $"\ - { pass "complete 'p \'a'"} - -re ".*$gdb_prompt $" { fail "complete 'p \'a'"} - timeout {fail "(timeout) complete 'p \'a'"} + { pass "complete 'p \'arg'"} + -re ".*$gdb_prompt $" { fail "complete 'p \'arg'"} + timeout {fail "(timeout) complete 'p \'arg'"} } } - -re ".*$gdb_prompt $" { fail "complete 'p \'a'" } - timeout { fail "(timeout) complete 'p \'a'" } + -re ".*$gdb_prompt $" { fail "complete 'p \'arg'" } + timeout { fail "(timeout) complete 'p \'arg'" } } -send_gdb "p 'a\t" +send_gdb "p 'arg\t" sleep 1 gdb_expect { - -re "^p 'a\\\x07$" { + -re "^p 'arg\\\x07$" { send_gdb "\t" gdb_expect { - -re ".*argv.*$gdb_prompt p .a$" { + -re ".*argv.*$gdb_prompt p 'arg$" { send_gdb "\n" gdb_expect { -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" { - pass "complete (2) 'p \'a'" + pass "complete (2) 'p \'arg'" } - -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" } - timeout { fail "(timeout) complete (2) 'p \'a'" } + -re ".*$gdb_prompt $" { fail "complete (2) 'p \'arg'" } + timeout { fail "(timeout) complete (2) 'p \'arg'" } } } -re "(There are $decimal possibilities\\. Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" { send_gdb "n" gdb_expect { - -re "\\(gdb\\) p 'a$" { + -re "\\(gdb\\) p 'arg$" { send_gdb "\n" gdb_expect { -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" { - pass "complete (2) 'p \'a'" + pass "complete (2) 'p \'arg'" } -re ".*$gdb_prompt $" { - fail "complete (2) 'p \'a'" + fail "complete (2) 'p \'arg'" } - timeout { fail "(timeout) complete (2) 'p \'a'" } + timeout { fail "(timeout) complete (2) 'p \'arg'" } } } - -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" } - timeout { fail "(timeout) complete (2) 'p \'a'" } + -re ".*$gdb_prompt $" { fail "complete (2) 'p \'arg'" } + timeout { fail "(timeout) complete (2) 'p \'arg'" } } } - -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" } - timeout { fail "(timeout) complete (2) 'p \'a'" } + -re ".*$gdb_prompt $" { fail "complete (2) 'p \'arg'" } + timeout { fail "(timeout) complete (2) 'p \'arg'" } } } - -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" } - timeout { fail "(timeout) complete (2) 'p \'a'" } + -re ".*$gdb_prompt $" { fail "complete (2) 'p \'arg'" } + timeout { fail "(timeout) complete (2) 'p \'arg'" } } @@ -499,84 +516,84 @@ gdb_expect { # # So, I'm hoping that there is no system with a static library variable named # `no_var_by_this_name'. -send_gdb "p no_var_named_this-a\t" +send_gdb "p no_var_named_this-arg\t" sleep 1 gdb_expect { - -re "^p no_var_named_this-a\\\x07$" { + -re "^p no_var_named_this-arg\\\x07$" { send_gdb "\n" gdb_expect { -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" { - pass "complete 'p no_var_named_this-a'" + pass "complete 'p no_var_named_this-arg'" } -re ".*$gdb_prompt $" { - fail "complete 'p no_var_named_this-a'" + fail "complete 'p no_var_named_this-arg'" } timeout { - fail "(timeout) complete 'p no_var_named_this-a'" + fail "(timeout) complete 'p no_var_named_this-arg'" } } } -re ".*$gdb_prompt $" { - fail "complete 'p no_var_named_this-a'" + fail "complete 'p no_var_named_this-arg'" } timeout { - fail "(timeout) complete 'p no_var_named_this-a'" + fail "(timeout) complete 'p no_var_named_this-arg'" } } -send_gdb "p no_var_named_this-a\t" +send_gdb "p no_var_named_this-arg\t" sleep 1 gdb_expect { - -re "^p no_var_named_this-a\\\x07$" { + -re "^p no_var_named_this-arg\\\x07$" { send_gdb "\t" gdb_expect { - -re ".*argv.*$gdb_prompt p no_var_named_this-a$" { + -re ".*argv.*$gdb_prompt p no_var_named_this-arg$" { send_gdb "\n" gdb_expect { -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" { - pass "complete (2) 'p no_var_named_this-a'" + pass "complete (2) 'p no_var_named_this-arg'" } -re ".*$gdb_prompt $" { - fail "complete (2) 'p no_var_named_this-a'" + fail "complete (2) 'p no_var_named_this-arg'" } timeout { - fail "(timeout) complete (2) 'p no_var_named_this-a'" + fail "(timeout) complete (2) 'p no_var_named_this-arg'" } } } -re "(There are $decimal possibilities\\. Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" { send_gdb "n" gdb_expect { - -re "\\(gdb\\) p no_var_named_this-a$" { + -re "\\(gdb\\) p no_var_named_this-arg$" { send_gdb "\n" gdb_expect { -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" { - pass "complete (2) 'p no_var_named_this-a'" + pass "complete (2) 'p no_var_named_this-arg'" } -re ".*$gdb_prompt $" { - fail "complete (2) 'p no_var_named_this-a'" + fail "complete (2) 'p no_var_named_this-arg'" } timeout { - fail "(timeout) complete (2) 'p no_var_named_this-a'" + fail "(timeout) complete (2) 'p no_var_named_this-arg'" } } } -re ".*$gdb_prompt $" { - fail "complete (2) 'p no_var_named_this-a'" + fail "complete (2) 'p no_var_named_this-arg'" } timeout { - fail "(timeout) complete (2) 'p no_var_named_this-a'" + fail "(timeout) complete (2) 'p no_var_named_this-arg'" } } } -re ".*$gdb_prompt $" { - fail "complete (2) 'p no_var_named_this-a'" + fail "complete (2) 'p no_var_named_this-arg'" } - timeout { fail "(timeout) complete (2) 'p no_var_named_this-a'" } + timeout { fail "(timeout) complete (2) 'p no_var_named_this-arg'" } } } - -re ".*$gdb_prompt $" { fail "complete (2) 'p no_var_named_this-a'" } - timeout { fail "(timeout) complete (2) 'p no_var_named_this-a'" } + -re ".*$gdb_prompt $" { fail "complete (2) 'p no_var_named_this-arg'" } + timeout { fail "(timeout) complete (2) 'p no_var_named_this-arg'" } } send_gdb "p no_var_named_this-\t" @@ -610,6 +627,20 @@ gdb_expect { } } } + -re ".*argv.*$gdb_prompt p no_var_named_this-$" { + send_gdb "\n" + gdb_expect { + -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" { + pass "complete (2) 'p no_var_named_this-'" + } + -re ".*$gdb_prompt $" { + fail "complete (2) 'p no_var_named_this-'" + } + timeout { + fail "(timeout) complete (2) 'p no_var_named_this-'" + } + } + } -re ".*$gdb_prompt $" { fail "complete (2) 'p no_var_named_this-'" } @@ -620,6 +651,52 @@ gdb_expect { timeout { fail "(timeout) complete (2) 'p no_var_named_this-'" } } +send_gdb "p values\[0\].a\t" +sleep 3 +gdb_expect { + -re "^p values.0..a_field $"\ + { send_gdb "\n" + sleep 1 + gdb_expect { + -re "^.* = 0.*$gdb_prompt $"\ + { pass "complete 'p values\[0\].a'"} + -re ".*$gdb_prompt $" { fail "complete 'p values\[0\].a'"} + timeout {fail "(timeout) complete 'p values\[0\].a'"} + } + } + -re ".*$gdb_prompt $" { fail "complete 'p values\[0\].a'" } + timeout { fail "(timeout) complete 'p values\[0\].a' 2" } + } + +send_gdb "p values\[0\] . a\t" +gdb_expect { + -re "^p values.0. . a_field $"\ + { send_gdb "\n" + gdb_expect { + -re "^.* = 0.*$gdb_prompt $"\ + { pass "complete 'p values\[0\] . a'"} + -re ".*$gdb_prompt $" { fail "complete 'p values\[0\] . a'"} + timeout {fail "(timeout) complete 'p values\[0\] . a'"} + } + } + -re ".*$gdb_prompt $" { fail "complete 'p values\[0\] . a'" } + timeout { fail "(timeout) complete 'p values\[0\] . a' 2" } + } + +send_gdb "p &values\[0\] -> a\t" +gdb_expect { + -re "^p &values.0. -> a_field $"\ + { send_gdb "\n" + gdb_expect { + -re "^.* = .*0x\[0-9a-fA-F\]*.*$gdb_prompt $"\ + { pass "complete 'p &values\[0\] -> a'"} + -re ".*$gdb_prompt $" { fail "complete 'p &values\[0\] -> a'"} + timeout {fail "(timeout) complete 'p &values\[0\] -> a'"} + } + } + -re ".*$gdb_prompt $" { fail "complete 'p &values\[0\] -> a'" } + timeout { fail "(timeout) complete 'p &values\[0\] -> a' 2" } + } # The following tests used to simply try to complete `${objdir}/file', # and so on. The problem is that ${objdir} can be very long; the @@ -671,19 +748,14 @@ sleep 1 gdb_expect { -re "^file ./gdb.base/completion\\.exp $"\ { send_gdb "\n" - gdb_expect { - -re "\r\nA program is being debugged already\\. Kill it\\? \\(y or n\\) $" - { send_gdb "n\n" - gdb_expect { - -re "\r\nProgram not killed\\.\r\n$gdb_prompt $"\ - { pass "complete 'file ./gdb.base/complet'"} - -re ".*$gdb_prompt $" { fail "complete 'file ./gdb.base/complet'"} - timeout {fail "(timeout) complete 'file ./gdb.base/complet'"} - } - } - -re ".*$gdb_prompt $" { fail "complete 'file ./gdb.base/complet'"} - timeout {fail "(timeout) complete 'file ./gdb.base/complet'"} - } + # Ignore the exact error message. + gdb_test_multiple "" "complete 'file ./gdb.base/complet'" { + -re "\r\nA program is being debugged already\\.\[\r\n\]+Are you sure you want to change the file\\? \\(y or n\\) $" { + send_gdb "n\n" + exp_continue + } + -re ".*$gdb_prompt $" { pass "complete 'file ./gdb.base/complet'" } + } } -re ".*$gdb_prompt $" { fail "complete 'file ./gdb.base/complet'" } timeout { fail "(timeout) complete 'file ./gdb.base/complet'" } @@ -733,6 +805,24 @@ gdb_expect { timeout { fail "(timeout) complete 'set follow-fork-mode'" } } +send_gdb "p values\[0\].nonex.\t" +gdb_expect { + -re "Type struct some_struct has no component named nonex.\r\n$gdb_prompt $"\ + { pass "Completing non-existing component" } + -re ".*$gdb_prompt $" { fail "Completing non-existing component" } + timeout { fail "(timeout) Completing non-existing component" } + eof { fail "(eof) Completing non-existing component #2" } + } +# Double memory freeing gets found only on the second run: +send_gdb "p values\[0\].nonex.\t" +gdb_expect { + -re "Type struct some_struct has no component named nonex.\r\n$gdb_prompt $"\ + { pass "Completing non-existing component #2" } + -re ".*$gdb_prompt $" { fail "Completing non-existing component #2" } + timeout { fail "(timeout) Completing non-existing component #2" } + eof { fail "(eof) Completing non-existing component #2" } + } + # Restore globals modified in this test... if [info exists old_inputrc] { set env(INPUTRC) $old_inputrc