diff options
| author | Andrew Cagney <cagney@redhat.com> | 2002-08-01 22:06:49 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2002-08-01 22:06:49 +0000 |
| commit | b6dacc68d085d0013fd5e9b072effcdef13070e9 (patch) | |
| tree | ca184bdde175aa45fdf4362127d97e6f7cad6d91 | |
| parent | 8ad58b9c5e3da2b1f51594955c4c1200e3538172 (diff) | |
| download | gdb-b6dacc68d085d0013fd5e9b072effcdef13070e9.tar.gz | |
* lib/gdb.exp (gdb_expect_list): Only print one pass, fail, or
supress message.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4eba1d12bb1..b50340203fb 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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> * Makefile.in (TARGET_FLAGS_TO_PASS): Remove CHILLFLAGS, CHILL, diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 0ccc1b64fcc..b4a0b8a0bd0 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1265,6 +1265,7 @@ proc gdb_expect_list {test sentinel list} { set ok 1 if { $suppress_flag } { set ok 0 + unresolved "${test}" } while { ${index} < [llength ${list}] } { set pattern [lindex ${list} ${index}] @@ -1273,41 +1274,42 @@ proc gdb_expect_list {test sentinel list} { if { ${ok} } { gdb_expect { -re "${pattern}${sentinel}" { - pass "${test}, pattern ${index} + sentinel" + # pass "${test}, pattern ${index} + sentinel" } -re "${sentinel}" { - fail "${test}, pattern ${index} + sentinel" + fail "${test} (pattern ${index} + sentinel)" set ok 0 } timeout { - fail "${test}, pattern ${index} + sentinel (timeout)" + fail "${test} (pattern ${index} + sentinel) (timeout)" set ok 0 } } } else { - unresolved "${test}, pattern ${index} + sentinel" + # unresolved "${test}, pattern ${index} + sentinel" } } else { if { ${ok} } { gdb_expect { -re "${pattern}" { - pass "${test}, pattern ${index}" + # pass "${test}, pattern ${index}" } -re "${sentinel}" { - fail "${test}, pattern ${index}" + fail "${test} (pattern ${index})" set ok 0 } timeout { - fail "${test}, pattern ${index} (timeout)" + fail "${test} (pattern ${index}) (timeout)" set ok 0 } } } else { - unresolved "${test}, pattern ${index}" + # unresolved "${test}, pattern ${index}" } } } if { ${ok} } { + pass "${test}" return 0 } else { return 1 |