FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lib/gdb.exp (gdb_test_multiple): Expect newline and secondary

Browse source 
prompt for each extra line in command.
This commit is contained in:
Joseph Myers 2011-10-17 17:10:55 +00:00
parent 0a07729b43
commit 543a932338
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-17 Joseph Myers <joseph@codesourcery.com>
* lib/gdb.exp (gdb_test_multiple): Expect newline and secondary
prompt for each extra line in command.
2011-10-17 Jan Kratochvil <jan.kratochvil@redhat.com> 2011-10-17 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.dwarf2/dw2-simple-locdesc.exp (p &s.shl): KFAIL it. * gdb.dwarf2/dw2-simple-locdesc.exp (p &s.shl): KFAIL it.

4
gdb/testsuite/lib/gdb.exp
View file

@ -677,6 +677,7 @@ proc gdb_test_multiple { command message user_code } {
set result -1 set result -1
set string "${command}\n"; set string "${command}\n";
if { $command != "" } { if { $command != "" } {
set multi_line_re "\[\r\n\] *>"
while { "$string" != "" } { while { "$string" != "" } {
set foo [string first "\n" "$string"]; set foo [string first "\n" "$string"];
set len [string length "$string"]; set len [string length "$string"];
@ -697,10 +698,11 @@ proc gdb_test_multiple { command message user_code } {
# command output is not lost for pattern matching # command output is not lost for pattern matching
# - guo # - guo
gdb_expect 2 { gdb_expect 2 {
-notransfer -re "\[\r\n\]" { verbose "partial: match" 3 } -notransfer -re "$multi_line_re$" { verbose "partial: match" 3 }
timeout { verbose "partial: timeout" 3 } timeout { verbose "partial: timeout" 3 }
} }
set string [string range "$string" [expr $foo + 1] end]; set string [string range "$string" [expr $foo + 1] end];
set multi_line_re "$multi_line_re.*\[\r\n\] *>"
} else { } else {
break; break;
} }