On 6/25/21 4:46 PM, Simon Marchi wrote:
> On 2021-06-24 11:34 a.m., Tom de Vries wrote:
>> Hi,
>>
>> At the moment some check-read1 timeouts are handled like this in
>> gdb.base/info-macros.exp:
>> ...
>> gdb_test_multiple_with_read1_timeout_factor 10 "$test" $testname {
>>   -re "$r1$r2$r3" {
>>      pass $testname
>>   }
>>   -re ".*#define TWO.*\r\n$gdb_prompt" {
>>      fail $testname
>>   }
>>   -re ".*#define THREE.*\r\n$gdb_prompt" {
>>      fail $testname
>>   }
>>   -re ".*#define FOUR.*\r\n$gdb_prompt" {
>>      fail $testname
>>   }
>> }
>> ...
>> which is not ideal.
>>
>> We could use gdb_test_lines, but it currently doesn't support verifying
>> the absence of regexps, which is currently implemented using the clauses above
>> calling fail.
>>
>> Fix this by using gdb_test_lines and adding a -re-not syntax to
>> gdb_test_lines, such that we can do:
>> ...
>> gdb_test_lines $test $testname $r1.*$r2 \
>>     -re-not "#define TWO" \
>>     -re-not "#define THREE" \
>>     -re-not "#define FOUR"
>> ...
>>
>> Only removing one use of gdb_test_multiple_with_read1_timeout_factor in the
>> test-case for now.
>>
>> Tested on x86_64-linux, which make targets check and check-read1.
>>
>> Any comments?
> 
> I don't see anything wrong with the patch, seems useful.

Thanks for the review.

I've now applied this to the whole test-case, and committed as attached.

Thanks,
- Tom