From a065d7af0e229f022f2517c3d151434278bfb22b Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 21 Sep 2012 08:39:08 +0000 Subject: [PATCH] gdb/testsuite: * gdb.mi/mi-cli.exp: Remove. * gdb.mi/mi2-cli.exp: Merged from mi-cli.exp. --- gdb/testsuite/ChangeLog | 5 + gdb/testsuite/gdb.mi/mi-cli.exp | 215 ------------------------------- gdb/testsuite/gdb.mi/mi2-cli.exp | 40 +++++- 3 files changed, 43 insertions(+), 217 deletions(-) delete mode 100644 gdb/testsuite/gdb.mi/mi-cli.exp diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6100603744b..0db20e8b13f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-09-21 Yao Qi + + * gdb.mi/mi-cli.exp: Remove. + * gdb.mi/mi2-cli.exp: Merged from mi-cli.exp. + 2012-09-21 Yao Qi * gdb.mi/mi-reverse.exp: Fix the typo in expected output of diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp deleted file mode 100644 index f487cbd2297..00000000000 --- a/gdb/testsuite/gdb.mi/mi-cli.exp +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 2002-2005, 2007-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 . - -# This file tests that GDB's console can be accessed via the MI. -# Specifically, we are testing the "interpreter-exec" command and that -# the commands that are executed via this command are properly executed. -# Console commands executed via MI should use MI output wrappers, MI event -# handlers, etc. - -load_lib mi-support.exp -set MIFLAGS "-i=mi" - -gdb_exit -if [mi_gdb_start] { - continue -} - -standard_testfile basics.c - -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-cli.exp - return -1 -} - -mi_gdb_test "-interpreter-exec" \ - {\^error,msg="-interpreter-exec: Usage: -interpreter-exec interp command"} \ - "-interpreter-exec with no arguments" - -mi_gdb_test "-interpreter-exec console" \ - {\^error,msg="-interpreter-exec: Usage: -interpreter-exec interp command"} \ - "-interpreter-exec with one argument" - -mi_gdb_test "-interpreter-exec bogus command" \ - {\^error,msg="-interpreter-exec: could not find interpreter \\\"bogus\\\""} \ - "-interpreter-exec with bogus interpreter" - -set msg {Undefined command: \\\"bogus\\\"\. Try \\\"help\\\"\.} -mi_gdb_test "-interpreter-exec console bogus" \ - "&\\\"$msg\\\\n\\\".*\\^error,msg=\\\"$msg\\\".*" \ - "-interpreter-exec console bogus" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "-interpreter-exec console \"file $binfile\"" \ -# {(=.*)+\^done} \ -# "-interpreter-exec console \"file \$binfile\"" -mi_gdb_test "-interpreter-exec console \"file $binfile\"" \ - {~"Reading symbols from .*mi-cli...".*done} \ - "-interpreter-exec console \"file \$binfile\"" - -mi_run_to_main - -set line_main_head [gdb_get_line_number "main ("] -set line_main_body [expr $line_main_head + 2] -set line_main_hello [gdb_get_line_number "Hello, World!"] -set line_main_return [expr $line_main_hello + 2] -set line_callee4_head [gdb_get_line_number "callee4 ("] -set line_callee4_body [expr $line_callee4_head + 2] -set line_callee4_next [expr $line_callee4_body + 1] - -mi_gdb_test "-interpreter-exec console \"set args foobar\"" \ - ".*=cmd-param-changed,param=\"args\",value=\"foobar\".*\\^done" \ - "-interpreter-exec console \"set args foobar\"" - -mi_gdb_test "-interpreter-exec console \"show args\"" \ - {\~"Argument list to give program being debugged when it is started is \\\"foobar\\\"\.\\n".*\^done} \ - "-interpreter-exec console \"show args\"" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "-interpreter-exec console \"break callee4\"" \ -# {(&.*)*.*~"Breakpoint 2 at.*\\n".*=breakpoint-create,number="2".*\^done} \ -# "-interpreter-exec console \"break callee4\"" -mi_gdb_test "-interpreter-exec console \"break callee4\"" \ - {(&.*)*.*~"Breakpoint 2 at.*\\n".*\^done} \ - "-interpreter-exec console \"break callee4\"" - -mi_gdb_test "-interpreter-exec console \"info break\"" \ - {\~"Num[ \t]*Type[ \t]*Disp[ \t]*Enb[ \t]*Address[ \t]*What\\n".*~"2[ \t]*breakpoint[ \t]*keep[ \t]*y[ \t]*0x[0-9A-Fa-f]+[ \t]*in callee4 at .*basics.c:[0-9]+\\n".*\^done} \ - "-interpreter-exec console \"info break\"" - -mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \ - ".*=cmd-param-changed,param=\"listsize\",value=\"1\".*\\^done" \ - "-interpreter-exec console \"set listsize 1\"" - -# {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done } -mi_gdb_test "-interpreter-exec console \"list\"" \ - ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \ - "-interpreter-exec console \"list\"" - -mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" $line_callee4_body \ - { "" "disp=\"keep\"" } "continue to callee4" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "100-interpreter-exec console \"delete 2\"" \ -# {.*=breakpoint-delete,number=\"2\".*\^done} \ -# "-interpreter-exec console \"delete 2\"" -mi_gdb_test "100-interpreter-exec console \"delete 2\"" \ - {=breakpoint-deleted,id=\"2\"\r\n100\^done} \ - "-interpreter-exec console \"delete 2\"" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "200-interpreter-exec console \"up\"" \ -# {.*=selected-frame-level-changed,level="1".*\^done} \ -# "-interpreter-exec console \"up\"" -mi_gdb_test "200-interpreter-exec console \"up\"" \ - {~"#.*".*200\^done} \ - "-interpreter-exec console \"up\"" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "300-interpreter-exec console \"down\"" \ -# {.*=selected-frame-level-changed,level="0".*\^done} \ -# "-interpreter-exec console \"down\"" -mi_gdb_test "300-interpreter-exec console \"down\"" \ - {~"#.*".*300\^done} \ - "-interpreter-exec console \"down\"" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "-interpreter-exec console \"frame 2\"" \ -# {.*=selected-frame-level-changed,level="2".*\^done} \ -# "-interpreter-exec console \"frame 2\"" -mi_gdb_test "400-interpreter-exec console \"frame 2\"" \ - {~"#.*".*400\^done} \ - "-interpreter-exec console \"frame 2\"" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "-stack-select-frame 0" \ -# {.*=selected-frame-level-changed,level="0".*\^done} \ -# "-stack-select-frame 0" -mi_gdb_test "500-stack-select-frame 0" \ - {500\^done} \ - "-stack-select-frame 0" - -# When a CLI command is entered in MI session, the respose is different in -# sync and async modes. In sync mode normal_stop is called when current -# interpreter is CLI. So: -# - print_stop_reason prints stop reason in CLI uiout, and we don't show it -# in MI -# - The stop position is printed, and appears in MI 'console' channel. -# -# In async mode the stop event is processed when we're back to MI interpreter, -# so the stop reason is printed into MI uiout an. -if {$async} { - set reason "end-stepping-range" -} else { - set reason "" -} - -mi_execute_to "interpreter-exec console step" $reason "callee4" "" ".*basics.c" $line_callee4_next \ - "" "check *stopped from CLI command" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "-break-insert -t basics.c:$line_main_hello" \ -# {.*=breakpoint-create,number="3".*\^done} \ -# "-break-insert -t basics.c:\$line_main_hello" -mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \ - {600\^done,bkpt=.number="3",type="breakpoint".*\}} \ - "-break-insert -t basics.c:\$line_main_hello" - -mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*basics.c" \ - $line_main_hello { "" "disp=\"del\"" } \ - "-exec-continue to line $line_main_hello" - -# Test that the token is output even for CLI commands -# Also test that *stopped includes frame information. -mi_gdb_test "34 next" \ - ".*34\\\^running.*\\*running,thread-id=\"all\"" \ - "34 next: run" - -if {!$async} { - gdb_expect { - -re "~\[^\r\n\]+\r\n" { - } - } -} - -# Note that the output does not include stop reason. This is fine. -# The purpose of *stopped notification for CLI command is to make -# sure that frontend knows that inferior is stopped, and knows where. -# Supplementary information is not necessary. -mi_expect_stop "$reason" "main" "" ".*basics.c" $line_main_return "" \ - "34 next: stop" - -mi_gdb_test "-interpreter-exec console \"list\"" \ - "\~\"$line_main_return\[\\\\t ]*callme \\(1\\);\\\\n\".*\\^done" \ - "-interpreter-exec console \"list\" at basics.c:\$line_main_return" - -mi_gdb_test "-interpreter-exec console \"help set args\"" \ - {\~"Set argument list to give program being debugged when it is started\.\\nFollow this command with any number of args, to be passed to the program\.".*\^done} \ - "-interpreter-exec console \"help set args\"" - -# NOTE: cagney/2003-02-03: Not yet. -# mi_gdb_test "-interpreter-exec console \"set \$pc=0x0\"" \ -# {.*=target-changed.*\^done} \ -# "-interpreter-exec console \"set \$pc=0x0\"" -mi_gdb_test "888-interpreter-exec console \"set \$pc=0x0\"" \ - {888\^done} \ - "-interpreter-exec console \"set \$pc=0x0\"" - -#mi_gdb_test "-interpreter-exec console \"\"" \ - {} \ - "-interpreter-exec console \"\"" - -mi_gdb_exit -return 0 diff --git a/gdb/testsuite/gdb.mi/mi2-cli.exp b/gdb/testsuite/gdb.mi/mi2-cli.exp index 9ab75182c31..73a79b5d8f6 100644 --- a/gdb/testsuite/gdb.mi/mi2-cli.exp +++ b/gdb/testsuite/gdb.mi/mi2-cli.exp @@ -67,6 +67,7 @@ set line_main_hello [gdb_get_line_number "Hello, World!"] set line_main_return [expr $line_main_hello + 2] set line_callee4_head [gdb_get_line_number "callee4 ("] set line_callee4_body [expr $line_callee4_head + 2] +set line_callee4_next [expr $line_callee4_body + 1] mi_gdb_test "-interpreter-exec console \"set args foobar\"" \ ".*=cmd-param-changed,param=\"args\",value=\"foobar\".*\\^done" \ @@ -141,6 +142,24 @@ mi_gdb_test "500-stack-select-frame 0" \ {500\^done} \ "-stack-select-frame 0" +# When a CLI command is entered in MI session, the respose is different in +# sync and async modes. In sync mode normal_stop is called when current +# interpreter is CLI. So: +# - print_stop_reason prints stop reason in CLI uiout, and we don't show it +# in MI +# - The stop position is printed, and appears in MI 'console' channel. +# +# In async mode the stop event is processed when we're back to MI interpreter, +# so the stop reason is printed into MI uiout an. +if {$async} { + set reason "end-stepping-range" +} else { + set reason "" +} + +mi_execute_to "interpreter-exec console step" $reason "callee4" "" ".*basics.c" $line_callee4_next \ + "" "check *stopped from CLI command" + # NOTE: cagney/2003-02-03: Not yet. # mi_gdb_test "-break-insert -t basics.c:$line_main_hello" \ # {.*=breakpoint-create,number="3".*\^done} \ @@ -153,8 +172,25 @@ mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*basics.c" \ $line_main_hello { "" "disp=\"del\"" } \ "-exec-continue to line $line_main_hello" -mi_execute_to "exec-next" "end-stepping-range" "main" "" ".*basics.c" $line_main_return "" \ - "-exec-next to line $line_main_return" +# Test that the token is output even for CLI commands +# Also test that *stopped includes frame information. +mi_gdb_test "34 next" \ + ".*34\\\^running.*\\*running,thread-id=\"all\"" \ + "34 next: run" + +if {!$async} { + gdb_expect { + -re "~\[^\r\n\]+\r\n" { + } + } +} + +# Note that the output does not include stop reason. This is fine. +# The purpose of *stopped notification for CLI command is to make +# sure that frontend knows that inferior is stopped, and knows where. +# Supplementary information is not necessary. +mi_expect_stop "$reason" "main" "" ".*basics.c" $line_main_return "" \ + "34 next: stop" mi_gdb_test "-interpreter-exec console \"list\"" \ "\~\"$line_main_return\[\\\\t ]*callme \\(1\\);\\\\n\".*\\^done" \ -- 2.30.2