aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Kingdon <jkingdon@engr.sgi.com>1993-08-17 04:21:55 +0000
committerJim Kingdon <jkingdon@engr.sgi.com>1993-08-17 04:21:55 +0000
commitc31a3b2a3b20646a193c54069a724e1de5d1adf8 (patch)
tree915bae8f47e1fdf2e87749887ec8082efb520d91
parent935d305dcc47a40f11de637d164b75f5f4c95a7b (diff)
downloadgdb-c31a3b2a3b20646a193c54069a724e1de5d1adf8.zip
gdb-c31a3b2a3b20646a193c54069a724e1de5d1adf8.tar.gz
gdb-c31a3b2a3b20646a193c54069a724e1de5d1adf8.tar.bz2
* gdb.stabs/wierd.exp: Deal with it if echo of "file" command
contains \r because the filename is long.
-rw-r--r--gdb/testsuite/gdb.stabs/wierd.exp8
1 files changed, 7 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.stabs/wierd.exp b/gdb/testsuite/gdb.stabs/wierd.exp
index 864bc5e..56d17b3 100644
--- a/gdb/testsuite/gdb.stabs/wierd.exp
+++ b/gdb/testsuite/gdb.stabs/wierd.exp
@@ -218,8 +218,14 @@ if ![file exists $binfile] then {
# xcoffread.c wrongly bitches about the lack of a text section.
setup_xfail "rs*-*-aix*"
send "file $binfile\n"
+ # If $binfile is very long, a \r (but not a \n) will echo in the
+ # middle of the echo of the command. So to match the echo, we
+ # would like to match anything not containing \n
+ # (we would prefer to be sure not to match any warning message).
+ # But \[^\n\]* doesn't seem to work, so instead use the heuristic
+ # that a filename won't contain a space and a warning message will.
expect {
- -re "^file $binfile\r*\nReading symbols from $binfile\.\.\.done\.\r*\n$prompt $" {
+ -re "^file \[^ \]*\r*\nReading symbols from $binfile\.\.\.done\.\r*\n$prompt $" {
pass "wierd.o read without error"
}
-re ".*$prompt $" {