Re: [PATCH] gdb: use gdb_test_multiple in gdb_breakpoint

Simon Marchi via Gdb-patches
2023-01-04T16:12:36Z

On 1/4/23 04:15, Lancelot SIX wrote:
> Hi Simon,
>
> On Tue, Jan 03, 2023 at 02:22:16PM -0500, Simon Marchi via Gdb-patches wrote:
>> When running the testsuite in a non-optimized build on a slow machine, I
>> sometimes get:
>>
>> UNTESTED: gdb.gdb/selftest.exp: Cannot set breakpoint at captured_main, skipping testcase.
>>
>> do_self_tests, in lib/selftest-support.exp, uses `with_timeout_factor
>> 10`, to account for the fact that reading the debug info of the gdb
>> binary (especially in a non-optimized GDB) can take time. But then it
>> ends up calling gdb_breakpoint, which uses gdb_expect with a hard-coded
>> timeout of 30 seconds.
>>
>> Fix this by making gdb_breakpoint use gdb_test_multiple, which is a
>> desired change anyway for this kind of simple command / expected
>> output case.
>>
>> Change-Id: I9b06ce991cc584810d8cc231b2b4893980b8be75
>> ---
>> gdb/testsuite/lib/gdb.exp | 32 +-------------------------------
>> 1 file changed, 1 insertion(+), 31 deletions(-)
>>
>> diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
>> index 135ace68d5ed..5a0cd46d8998 100644
>> --- a/gdb/testsuite/lib/gdb.exp
>> +++ b/gdb/testsuite/lib/gdb.exp
>> @@ -641,9 +641,8 @@ proc gdb_breakpoint { linespec args } {
>>
>> set test_name "gdb_breakpoint: set breakpoint at $linespec"
>
> Should you use $test_name as second arg of the call to gdb_test_multiple
> you introduce? This way the error cases handled by gdb_test_multiple
> will the desired test name.
>
> Also, I guess that to make is slightly more consistent with other usages
> of gdb_test_multiple, $gdb_test_name should be used instead of
> $test_name in the untouched actions.

Oh, right, I missed that. I folded the test name in the
gdb_test_multiple call (removed the test_name var) and used
$gdb_test_name in the fail call. I updated the patch locally. Should I
add your Reviewed-By after those changes?

Simon