[gdb/testsuite] Fix DUPLICATE in gdb.base/info-os.exp

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.
This commit is contained in:
Tom de Vries
2021-09-30 19:07:48 +02:00
parent 9ebd290966
commit 50f9e7d853

View File

@ -125,17 +125,16 @@ proc expect_multiline { command expect test } {
global gdb_prompt global gdb_prompt
# Do not duplicate FAILs from gdb_test_multiple. # Do not duplicate FAILs from gdb_test_multiple.
set pass 0 set found 0
set fail 0 set ok 0
gdb_test_multiple $command $test { gdb_test_multiple $command $test {
-re "^$expect *\r\n" { -re "^$expect *\r\n" {
pass $test set found 1
set pass 1
exp_continue exp_continue
} }
-re "^$gdb_prompt $" { -re "^$gdb_prompt $" {
if !$pass { if $found {
set fail 1 set ok 1
} }
# Exit the loop. # Exit the loop.
} }
@ -144,9 +143,7 @@ proc expect_multiline { command expect test } {
exp_continue exp_continue
} }
} }
if $fail { gdb_assert { $ok } $test
fail $test
}
} }
# Test output of the 'info os' commands against the expected results. # Test output of the 'info os' commands against the expected results.