diff options
| author | Jason Molenda <jsm@bugshack.cygnus.com> | 1999-07-05 17:51:38 +0000 |
|---|---|---|
| committer | Jason Molenda <jsm@bugshack.cygnus.com> | 1999-07-05 17:51:38 +0000 |
| commit | 86798ef76eb4b525d7e3b43be178ae68402a300c (patch) | |
| tree | 2125b7b5d1da40979380dfae8e393108a92ccf62 /gdb/testsuite | |
| parent | a2179a2a4106662b7412770a24880b8ad25a595b (diff) | |
| download | gdb-86798ef76eb4b525d7e3b43be178ae68402a300c.tar.gz | |
import gdb-1999-07-05 snapshot
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 50 |
2 files changed, 33 insertions, 22 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 376c575e281..6e53b6743de 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 29 11:56:06 1999 Andrew Cagney <cagney@b1.cygnus.com> + + * lib/gdb.exp (gdb_expect_list): Output one message per pattern in + a consistent format. + 1999-06-25 Stan Shebs <shebs@andros.cygnus.com> From Jimmy Guo <guo@cup.hp.com> and others at HP: diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index cb277bed822..3e71adcae6b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1105,38 +1105,44 @@ proc gdb_expect { args } { proc gdb_expect_list {test sentinal list} { global gdb_prompt set index 0 - while { ${index} >= 0 && ${index} < [llength ${list}] } { + set ok 1 + while { ${index} < [llength ${list}] } { set pattern [lindex ${list} ${index}] set index [expr ${index} + 1] if { ${index} == [llength ${list}] } { - gdb_expect { - -re "${pattern}${sentinal}" { - pass "${test} (sentinal)" - } - timeout { - fail "(timeout on sentinal) ${test}" - set index -1 + if { ${ok} } { + gdb_expect { + -re "${pattern}${sentinal}" { + pass "${test}, pattern ${index} + sentinal" + } + timeout { + fail "${test}, pattern ${index} + sentinal (timeout)" + set ok 0 + } } + } else { + fail "${test}, pattern ${index} + sentinal" } } else { - gdb_expect { - -re "${pattern}" { - pass "${test} (line ${index})" - } - -re "${sentinal}" { - fail "${test} (line ${index})" - set index -1 - } - timeout { - fail "(timeout on line ${index}) ${test}" - set index -1 + if { ${ok} } { + gdb_expect { + -re "${pattern}" { + pass "${test}, pattern ${index}" + } + -re "${sentinal}" { + fail "${test}, pattern ${index}" + set ok 0 + } + timeout { + fail "${test}, pattern ${index} (timeout)" + set ok 0 + } } + } else { + fail "${test}, pattern ${index}" } } } - if { ${index} >= 0 } { - pass "${test}" - } } # |