espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 04:49:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gdb/testsuite] Don't expect gdb_prompt in mi_skip_python_test

Browse Source 
When running gdb.python/py-mi-events.exp with make check-read1, we get:
...
(gdb) ^M
python print ('test')^M
&"python print ('test')\n"^M
~"test\n"^M
^done^M
(gdb) FAIL: gdb.python/py-mi-events.exp: verify python support
^M
python print (sys.version_info[0])^M
&"python print (sys.version_info[0])\n"^M
~"2\n"^M
^done^M
(gdb) FAIL: gdb.python/py-mi-events.exp: check if python 3
^M
...

The FAILs happen as follows.

On one hand, skip_python_tests_prompt uses the prompt_regexp parameter for the
user_code argument of gdb_test_multiple:
...
proc skip_python_tests_prompt { prompt_regexp } {
    global gdb_py_is_py3k

    gdb_test_multiple "python print ('test')" "verify python support" {
	-re "not supported.*$prompt_regexp" {
	    unsupported "Python support is disabled."
	    return 1
	}
	-re "$prompt_regexp" {}
    }

    gdb_test_multiple "python print (sys.version_info\[0\])" "check if python 3" {
	-re "3.*$prompt_regexp" {
            set gdb_py_is_py3k 1
        }
	-re ".*$prompt_regexp" {
            set gdb_py_is_py3k 0
        }
    }
...

On the other hand, gdb_test_multiple itself uses $gdb_prompt:
...
         -re "\r\n$gdb_prompt $" {
            if ![string match "" $message] then {
                fail "$message"
            }
            set result 1
        }
...

So when mi_skip_python_test calls skip_python_tests_prompt with prompt_regexp
set to $mi_gdb_prompt:
...
proc mi_skip_python_tests {} {
    global mi_gdb_prompt
    return [skip_python_tests_prompt "$mi_gdb_prompt$"]
}
...
and expect reads "(gdb) " and tries to match it (due to the READ1=1 setting),
the user_code regexps using $prompt_regexp (set to $mi_gdb_prompt) don't match,
but the $gdb_prompt regexp in gdb_test_multiple does match.

Fix this by adding a prompt_regexp parameter to gdb_test_multiple, and using the
parameter in skip_python_tests_prompt.

Tested gdb.python/py-mi-events.exp with make check READ1=1 x86_64-linux.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2019-07-29  Tom de Vries  <tdevries@suse.de>

	PR gdb/24855
	* lib/gdb.exp (gdb_test_multiple): Add prompt_regexp parameter.
	(skip_python_tests_prompt): Add prompt_regexp argument to
	gdb_test_multiple calls.
This commit is contained in:
Tom de Vries
2019-07-29 11:24:04 +02:00
parent cc5277b173
commit d17725d72f
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2019-07-29 Tom de Vries <tdevries@suse.de>
PR gdb/24855
* lib/gdb.exp (gdb_test_multiple): Add prompt_regexp parameter.
(skip_python_tests_prompt): Add prompt_regexp argument to
gdb_test_multiple calls.
2019-07-27 Tom Tromey <tom@tromey.com> 2019-07-27 Tom Tromey <tom@tromey.com>
* gdb.tui/main.exp: New file. * gdb.tui/main.exp: New file.

32
gdb/testsuite/lib/gdb.exp
View File

@ -695,7 +695,7 @@ proc gdb_internal_error_resync {} {
} }
# gdb_test_multiple COMMAND MESSAGE EXPECT_ARGUMENTS # gdb_test_multiple COMMAND MESSAGE EXPECT_ARGUMENTS PROMPT_REGEXP
# Send a command to gdb; test the result. # Send a command to gdb; test the result.
# #
# COMMAND is the command to execute, send to GDB with send_gdb. If # COMMAND is the command to execute, send to GDB with send_gdb. If
@ -707,6 +707,8 @@ proc gdb_internal_error_resync {} {
# context; action elements will be executed in the caller's context. # context; action elements will be executed in the caller's context.
# Unlike patterns for gdb_test, these patterns should generally include # Unlike patterns for gdb_test, these patterns should generally include
# the final newline and prompt. # the final newline and prompt.
# PROMPT_REGEXP is a regexp matching the expected prompt after the command
# output. If empty, defaults to "$gdb_prompt $"
# #
# Returns: # Returns:
# 1 if the test failed, according to a built-in failure pattern # 1 if the test failed, according to a built-in failure pattern
@ -744,7 +746,7 @@ proc gdb_internal_error_resync {} {
# expected from $gdb_spawn_id. IOW, callers do not need to worry # expected from $gdb_spawn_id. IOW, callers do not need to worry
# about resetting "-i" back to $gdb_spawn_id explicitly. # about resetting "-i" back to $gdb_spawn_id explicitly.
# #
proc gdb_test_multiple { command message user_code } { proc gdb_test_multiple { command message user_code { prompt_regexp "" } } {
global verbose use_gdb_stub global verbose use_gdb_stub
global gdb_prompt pagination_prompt global gdb_prompt pagination_prompt
global GDB global GDB
@ -754,6 +756,10 @@ proc gdb_test_multiple { command message user_code } {
upvar expect_out expect_out upvar expect_out expect_out
global any_spawn_id global any_spawn_id
if { "$prompt_regexp" == "" } {
set prompt_regexp "$gdb_prompt $"
}
if { $message == "" } { if { $message == "" } {
set message $command set message $command
} }
@ -913,7 +919,7 @@ proc gdb_test_multiple { command message user_code } {
} }
append code { append code {
-re "Ending remote debugging.*$gdb_prompt $" { -re "Ending remote debugging.*$prompt_regexp" {
if ![isnative] then { if ![isnative] then {
warning "Can`t communicate to remote target." warning "Can`t communicate to remote target."
} }
@ -921,17 +927,17 @@ proc gdb_test_multiple { command message user_code } {
gdb_start gdb_start
set result -1 set result -1
} }
-re "Undefined\[a-z\]* command:.*$gdb_prompt $" { -re "Undefined\[a-z\]* command:.*$prompt_regexp" {
perror "Undefined command \"$command\"." perror "Undefined command \"$command\"."
fail "$message" fail "$message"
set result 1 set result 1
} }
-re "Ambiguous command.*$gdb_prompt $" { -re "Ambiguous command.*$prompt_regexp" {
perror "\"$command\" is not a unique command name." perror "\"$command\" is not a unique command name."
fail "$message" fail "$message"
set result 1 set result 1
} }
-re "$inferior_exited_re with code \[0-9\]+.*$gdb_prompt $" { -re "$inferior_exited_re with code \[0-9\]+.*$prompt_regexp" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message (the program exited)" set errmsg "$message (the program exited)"
} else { } else {
@ -940,7 +946,7 @@ proc gdb_test_multiple { command message user_code } {
fail "$errmsg" fail "$errmsg"
set result -1 set result -1
} }
-re "$inferior_exited_re normally.*$gdb_prompt $" { -re "$inferior_exited_re normally.*$prompt_regexp" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message (the program exited)" set errmsg "$message (the program exited)"
} else { } else {
@ -949,7 +955,7 @@ proc gdb_test_multiple { command message user_code } {
fail "$errmsg" fail "$errmsg"
set result -1 set result -1
} }
-re "The program is not being run.*$gdb_prompt $" { -re "The program is not being run.*$prompt_regexp" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message (the program is no longer running)" set errmsg "$message (the program is no longer running)"
} else { } else {
@ -958,7 +964,7 @@ proc gdb_test_multiple { command message user_code } {
fail "$errmsg" fail "$errmsg"
set result -1 set result -1
} }
-re "\r\n$gdb_prompt $" { -re "\r\n$prompt_regexp" {
if ![string match "" $message] then { if ![string match "" $message] then {
fail "$message" fail "$message"
} }
@ -972,13 +978,13 @@ proc gdb_test_multiple { command message user_code } {
} }
-re "\\((y or n|y or \\\[n\\\]|\\\[y\\\] or n)\\) " { -re "\\((y or n|y or \\\[n\\\]|\\\[y\\\] or n)\\) " {
send_gdb "n\n" answer send_gdb "n\n" answer
gdb_expect -re "$gdb_prompt $" gdb_expect -re "$prompt_regexp"
fail "$message (got interactive prompt)" fail "$message (got interactive prompt)"
set result -1 set result -1
} }
-re "\\\[0\\\] cancel\r\n\\\[1\\\] all.*\r\n> $" { -re "\\\[0\\\] cancel\r\n\\\[1\\\] all.*\r\n> $" {
send_gdb "0\n" send_gdb "0\n"
gdb_expect -re "$gdb_prompt $" gdb_expect -re "$prompt_regexp"
fail "$message (got breakpoint menu)" fail "$message (got breakpoint menu)"
set result -1 set result -1
} }
@ -1869,7 +1875,7 @@ proc skip_python_tests_prompt { prompt_regexp } {
return 1 return 1
} }
-re "$prompt_regexp" {} -re "$prompt_regexp" {}
} } "$prompt_regexp"
gdb_test_multiple "python print (sys.version_info\[0\])" "check if python 3" { gdb_test_multiple "python print (sys.version_info\[0\])" "check if python 3" {
-re "3.*$prompt_regexp" { -re "3.*$prompt_regexp" {
@ -1878,7 +1884,7 @@ proc skip_python_tests_prompt { prompt_regexp } {
-re ".*$prompt_regexp" { -re ".*$prompt_regexp" {
set gdb_py_is_py3k 0 set gdb_py_is_py3k 0
} }
} } "$prompt_regexp"
return 0 return 0
} }