mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-01 13:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

2002-04-03 Daniel Jacobowitz <drow@mvista.com>

Browse Source 
* lib/gdb.exp (gdb_test): Move -notransfer inside of gdb_expect.
        (gdb_expect): Remove $notransfer hack.
This commit is contained in:
Daniel Jacobowitz 2002-04-03 16:17:11 +00:00
parent d7866f0459
commit 5f279fa6a9
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-03 Daniel Jacobowitz <drow@mvista.com>
* lib/gdb.exp (gdb_test): Move -notransfer inside of gdb_expect.
(gdb_expect): Remove $notransfer hack.
2002-04-02 Daniel Jacobowitz <drow@mvista.com>
* gdb.c++/classes.exp ("calling method for small class"): Match

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

@ -440,9 +440,9 @@ proc gdb_test { args } {
# we need to set -notransfer expect option so that
# command output is not lost for pattern matching
# - guo
gdb_expect -notransfer 2 {
-re "\[\r\n\]" { }
timeout { }
gdb_expect 2 {
-notransfer -re "\[\r\n\]" { verbose "partial: match" 3 }
timeout { verbose "partial: timeout" 3 }
}
set string [string range "$string" [expr $foo + 1] end];
} else {
@ -1132,20 +1132,6 @@ proc send_gdb { string } {
#
proc gdb_expect { args } {
# allow -notransfer expect flag specification,
# used by gdb_test routine for multi-line commands.
# packed with gtimeout when fed to remote_expect routine,
# which is a hack but due to what looks like a res and orig
# parsing problem in remote_expect routine (dejagnu/lib/remote.exp):
# what's fed into res is not removed from orig.
# - guo
if { [lindex $args 0] == "-notransfer" } {
set notransfer -notransfer;
set args [lrange $args 1 end];
} else {
set notransfer "";
}
if { [llength $args] == 2 && [lindex $args 0] != "-re" } {
set gtimeout [lindex $args 0];
set expcode [list [lindex $args 1]];
@ -1186,7 +1172,7 @@ proc gdb_expect { args } {
}
}
set code [catch \
{uplevel remote_expect host "$gtimeout $notransfer" $expcode} string];
{uplevel remote_expect host $gtimeout $expcode} string];
if [info exists old_val] {
set remote_suppress_flag $old_val;
} else {