* [committed][gdb/testsuite] Fix DUPLICATE in gdb.base/info-os.exp
@ 2021-09-30 17:11 Tom de Vries
0 siblings, 0 replies; only message in thread
From: Tom de Vries @ 2021-09-30 17:11 UTC (permalink / raw)
To: gdb-patches
Hi,
When running test-case gdb.base/info-os.exp, I run into:
...
PASS: gdb.base/info-os.exp: get threads
PASS: gdb.base/info-os.exp: get threads
DUPLICATE: gdb.base/info-os.exp: get threads
...
Fix this not doing pass followed by exp_continue in gdb_test_multiple.
Tested on x86_64-linux.
Committed to trunk.
Thanks,
- Tom
[gdb/testsuite] Fix DUPLICATE in gdb.base/info-os.exp
---
gdb/testsuite/gdb.base/info-os.exp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/gdb/testsuite/gdb.base/info-os.exp b/gdb/testsuite/gdb.base/info-os.exp
index b17a7842d5f..14bbbd95a07 100644
--- a/gdb/testsuite/gdb.base/info-os.exp
+++ b/gdb/testsuite/gdb.base/info-os.exp
@@ -125,17 +125,16 @@ proc expect_multiline { command expect test } {
global gdb_prompt
# Do not duplicate FAILs from gdb_test_multiple.
- set pass 0
- set fail 0
+ set found 0
+ set ok 0
gdb_test_multiple $command $test {
-re "^$expect *\r\n" {
- pass $test
- set pass 1
+ set found 1
exp_continue
}
-re "^$gdb_prompt $" {
- if !$pass {
- set fail 1
+ if $found {
+ set ok 1
}
# Exit the loop.
}
@@ -144,9 +143,7 @@ proc expect_multiline { command expect test } {
exp_continue
}
}
- if $fail {
- fail $test
- }
+ gdb_assert { $ok } $test
}
# Test output of the 'info os' commands against the expected results.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-30 17:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-30 17:11 [committed][gdb/testsuite] Fix DUPLICATE in gdb.base/info-os.exp Tom de Vries
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).