* lib/gdb.exp (gdb_expect_list): Only print one pass, fail, or

supress message.
This commit is contained in:
Andrew Cagney 2002-08-01 22:06:49 +00:00
parent 32a6503c60
commit a20ce2c398
2 changed files with 15 additions and 8 deletions

View file

@ -1,3 +1,8 @@
2002-08-01 Andrew Cagney <ac131313@redhat.com>
* lib/gdb.exp (gdb_expect_list): Only print one pass, fail, or
supress message.
2002-08-01 Andrew Cagney <cagney@redhat.com> 2002-08-01 Andrew Cagney <cagney@redhat.com>
* Makefile.in (TARGET_FLAGS_TO_PASS): Remove CHILLFLAGS, CHILL, * Makefile.in (TARGET_FLAGS_TO_PASS): Remove CHILLFLAGS, CHILL,

View file

@ -1265,6 +1265,7 @@ proc gdb_expect_list {test sentinel list} {
set ok 1 set ok 1
if { $suppress_flag } { if { $suppress_flag } {
set ok 0 set ok 0
unresolved "${test}"
} }
while { ${index} < [llength ${list}] } { while { ${index} < [llength ${list}] } {
set pattern [lindex ${list} ${index}] set pattern [lindex ${list} ${index}]
@ -1273,41 +1274,42 @@ proc gdb_expect_list {test sentinel list} {
if { ${ok} } { if { ${ok} } {
gdb_expect { gdb_expect {
-re "${pattern}${sentinel}" { -re "${pattern}${sentinel}" {
pass "${test}, pattern ${index} + sentinel" # pass "${test}, pattern ${index} + sentinel"
} }
-re "${sentinel}" { -re "${sentinel}" {
fail "${test}, pattern ${index} + sentinel" fail "${test} (pattern ${index} + sentinel)"
set ok 0 set ok 0
} }
timeout { timeout {
fail "${test}, pattern ${index} + sentinel (timeout)" fail "${test} (pattern ${index} + sentinel) (timeout)"
set ok 0 set ok 0
} }
} }
} else { } else {
unresolved "${test}, pattern ${index} + sentinel" # unresolved "${test}, pattern ${index} + sentinel"
} }
} else { } else {
if { ${ok} } { if { ${ok} } {
gdb_expect { gdb_expect {
-re "${pattern}" { -re "${pattern}" {
pass "${test}, pattern ${index}" # pass "${test}, pattern ${index}"
} }
-re "${sentinel}" { -re "${sentinel}" {
fail "${test}, pattern ${index}" fail "${test} (pattern ${index})"
set ok 0 set ok 0
} }
timeout { timeout {
fail "${test}, pattern ${index} (timeout)" fail "${test} (pattern ${index}) (timeout)"
set ok 0 set ok 0
} }
} }
} else { } else {
unresolved "${test}, pattern ${index}" # unresolved "${test}, pattern ${index}"
} }
} }
} }
if { ${ok} } { if { ${ok} } {
pass "${test}"
return 0 return 0
} else { } else {
return 1 return 1