espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-22 19:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gdb/testsuite] Don't use FOOBAR pattern in gdb_test

Browse Source 
If gdb_test is used with fewer than five arguments, then the question_string
defaults to "^FOOBAR$":
...
    if [llength $args]==5 {
       set question_string [lindex $args 3]
       set response_string [lindex $args 4]
    } else {
       set question_string "^FOOBAR$"
    }
...

This can however match "FOOBAR", so perhaps "\$FOOBAR^" would have been a
better choice.

Eliminate the FOOBAR pattern from gdb_test by instead of defining a default
regexp, conditionally appending the regexp matching to a user_code variable.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2019-09-19  Tom de Vries  <tdevries@suse.de>

	* lib/gdb.exp (gdb_test): Eliminate "^FOOBAR$" pattern.
This commit is contained in:
Tom de Vries
2019-09-19 19:54:15 +02:00
parent f64e2f4045
commit e452e88f54
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2019-09-19 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (gdb_test): Eliminate "^FOOBAR$" pattern.
2019-09-19 Tom de Vries <tdevries@suse.de> 2019-09-19 Tom de Vries <tdevries@suse.de>
* lib/gdbserver-support.exp (gdb_target_cmd): Fix argument passing. * lib/gdbserver-support.exp (gdb_target_cmd): Fix argument passing.

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

@ -1083,24 +1083,28 @@ proc gdb_test { args } {
set command [lindex $args 0] set command [lindex $args 0]
set pattern [lindex $args 1] set pattern [lindex $args 1]
if [llength $args]==5 { set user_code {}
set question_string [lindex $args 3] lappend user_code {
set response_string [lindex $args 4]
} else {
set question_string "^FOOBAR$"
}
return [gdb_test_multiple $command $message {
-re "\[\r\n\]*(?:$pattern)\[\r\n\]+$gdb_prompt $" { -re "\[\r\n\]*(?:$pattern)\[\r\n\]+$gdb_prompt $" {
if ![string match "" $message] then { if ![string match "" $message] then {
pass "$message" pass "$message"
} }
} }
-re "(${question_string})$" { }
send_gdb "$response_string\n"
exp_continue if { [llength $args] == 5 } {
set question_string [lindex $args 3]
set response_string [lindex $args 4]
lappend user_code {
-re "(${question_string})$" {
send_gdb "$response_string\n"
exp_continue
}
} }
}] }
set user_code [join $user_code]
return [gdb_test_multiple $command $message $user_code]
} }
# Return 1 if version MAJOR.MINOR is at least AT_LEAST_MAJOR.AT_LEAST_MINOR. # Return 1 if version MAJOR.MINOR is at least AT_LEAST_MAJOR.AT_LEAST_MINOR.