* lib/gdb.exp (gdb_test_multiple): Correct formatting.

This commit is contained in:
Maciej W. Rozycki
2012-05-09 14:29:49 +00:00
parent 2efbc0f722
commit 9bfee71961
2 changed files with 35 additions and 31 deletions

View File

@ -1,3 +1,7 @@
2012-05-09 Maciej W. Rozycki <macro@codesourcery.com>
* lib/gdb.exp (gdb_test_multiple): Correct formatting.
2012-05-08 Maciej W. Rozycki <macro@codesourcery.com> 2012-05-08 Maciej W. Rozycki <macro@codesourcery.com>
* gdb.mi/mi-var-display.exp: Check for the existence of $fp * gdb.mi/mi-var-display.exp: Check for the existence of $fp

View File

@ -587,7 +587,7 @@ proc gdb_test_multiple { command message user_code } {
} }
if {$use_gdb_stub if {$use_gdb_stub
&& [regexp -nocase {^\s*(r|run|star|start|at|att|atta|attac|attach)\M} \ && [regexp -nocase {^\s*(r|run|star|start|at|att|atta|attac|attach)\M} \
$command]} { $command]} {
error "gdbserver does not support $command without extended-remote" error "gdbserver does not support $command without extended-remote"
} }
@ -727,21 +727,21 @@ proc gdb_test_multiple { command message user_code } {
} }
set code { set code {
-re ".*A problem internal to GDB has been detected" { -re ".*A problem internal to GDB has been detected" {
fail "$message (GDB internal error)" fail "$message (GDB internal error)"
gdb_internal_error_resync gdb_internal_error_resync
} }
-re "\\*\\*\\* DOSEXIT code.*" { -re "\\*\\*\\* DOSEXIT code.*" {
if { $message != "" } { if { $message != "" } {
fail "$message"; fail "$message";
} }
gdb_suppress_entire_file "GDB died"; gdb_suppress_entire_file "GDB died";
set result -1; set result -1;
} }
} }
append code $processed_code append code $processed_code
append code { append code {
-re "Ending remote debugging.*$gdb_prompt $" { -re "Ending remote debugging.*$gdb_prompt $" {
if ![isnative] then { if ![isnative] then {
warning "Can`t communicate to remote target." warning "Can`t communicate to remote target."
} }
@ -749,17 +749,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:.*$gdb_prompt $" {
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.*$gdb_prompt $" {
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\]+.*$gdb_prompt $" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message (the program exited)" set errmsg "$message (the program exited)"
} else { } else {
@ -768,7 +768,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.*$gdb_prompt $" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message (the program exited)" set errmsg "$message (the program exited)"
} else { } else {
@ -777,7 +777,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.*$gdb_prompt $" {
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 {
@ -786,16 +786,16 @@ 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$gdb_prompt $" {
if ![string match "" $message] then { if ![string match "" $message] then {
fail "$message" fail "$message"
} }
set result 1 set result 1
} }
"<return>" { "<return>" {
send_gdb "\n" send_gdb "\n"
perror "Window too small." perror "Window too small."
fail "$message" fail "$message"
set result -1 set result -1
} }
-re "\\((y or n|y or \\\[n\\\]|\\\[y\\\] or n)\\) " { -re "\\((y or n|y or \\\[n\\\]|\\\[y\\\] or n)\\) " {
@ -810,16 +810,16 @@ proc gdb_test_multiple { command message user_code } {
fail "$message (got breakpoint menu)" fail "$message (got breakpoint menu)"
set result -1 set result -1
} }
eof { eof {
perror "Process no longer exists" perror "Process no longer exists"
if { $message != "" } { if { $message != "" } {
fail "$message" fail "$message"
} }
return -1 return -1
} }
full_buffer { full_buffer {
perror "internal buffer is full." perror "internal buffer is full."
fail "$message" fail "$message"
set result -1 set result -1
} }
timeout { timeout {