[gdb/testsuite] Add -cooked pattern flag to gdb_test_multiple
Commit Message
On 05-10-19 17:38, Andrew Burgess wrote:
> * Tom de Vries <tdevries@suse.de> [2019-10-05 08:05:03 +0200]:
>
>> [ was: Re: [PATCH][gdb/testsuite] Introduce gdb_test_ext ]
>>
>> On 19-09-19 21:24, Andrew Burgess wrote:
>>> On further thought, I actually think there's no need for an extra
>>> function at all, we can get all the benefit (as I see it) by possibly
>>> updating gdb_test_multiple. I'm travelling right now so can't code
>>> this up, but I think a solution that does something like this:
>>>
>>> gdb_test_multiple "command" "test name" {
>>> -re "full regexp here$gdb_prompt" {
>>> pass $gdb_test_multiple_name
>>> }
>>> -output "pattern without prompt" {
>>> fail $gdb_test_multiple_name
>>> }
>>> }
>>>
>>> So using '-re' and '-output' to specialise the behaviour of
>>> gdb_test_multiple, and adding in the $gdb_test_multiple_name variable.
>>>
>>> When I get back to my desk I'll try to code this up.
>>
>> Hi,
>>
>> I took a stab at this. I'm not sure about the naming though.
>>
>> For the pattern flag I used the name -cooked. Perhaps -wrap is better?
>> Any better suggestions?
>>
>> I used gdb_test_multiple_message (using the 'message' postfix because it
>> matched the name of the gdb_test_multiple argument) for the convenience
>> variable, but it's a tad long, perhaps we could abbreviate to
>> 'gtm_message'?
>
> This duplicates work in this patch:
>
> https://sourceware.org/ml/gdb-patches/2019-10/msg00023.html
>
I've rebased on top of that patch (with gdb_test_multiple_name ->
gdb_test_name applied).
Thanks,
- Tom
[gdb/testsuite] Add -cooked pattern flag to gdb_test_multiple
Currently, in order to rewrite:
...
gdb_test <command> <pattern> <message>
...
using gdb_test_multiple, we get:
...
gdb_test_multiple <command> <message> {
-re "\[\r\n\]*(?:<pattern>)\[\r\n\]+$gdb_prompt $" {
pass $gdb_test_name
}
}
...
Add a '-cooked' pattern flag to gdb_test_multiple, that wraps the regexp
pattern as gdb_test wraps its message argument.
This allows us to rewrite into the more compact:
...
gdb_test_multiple <command> <message> {
-re -cooked <pattern> {
pass $gdb_test_name
}
}
...
Tested on x86_64-linux.
gdb/testsuite/ChangeLog:
2019-10-04 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (gdb_test_multiple): Add -cooked pattern flag.
* gdb.reverse/step-precsave.exp: Rewrite gdb_test_multiple containing
kfail using -cooked pattern flag and convenience variable
gdb_test_name.
---
gdb/testsuite/gdb.reverse/step-precsave.exp | 13 +++++--------
gdb/testsuite/lib/gdb.exp | 14 +++++++++++++-
2 files changed, 18 insertions(+), 9 deletions(-)
@@ -46,15 +46,12 @@ gdb_test "break $end_of_main" \
# This can take awhile.
with_timeout_factor 20 {
- set test "run to end of main"
- set pass_pattern "Breakpoint .* end of main .*"
- set kfail_pattern "Process record does not support instruction 0xc5 at.*"
- gdb_test_multiple "continue" $test {
- -re "\[\r\n\]*(?:$pass_pattern)\[\r\n\]+$gdb_prompt $" {
- pass $test
+ gdb_test_multiple "continue" "run to end of main" {
+ -re -cooked "Breakpoint .* end of main .*" {
+ pass $gdb_test_name
}
- -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" {
- kfail "record/23188" $test
+ -re -cooked "Process record does not support instruction 0xc5 at.*" {
+ kfail "record/23188" $gdb_test_name
}
}
}
@@ -821,6 +821,7 @@ proc gdb_test_multiple { command message user_code { prompt_regexp "" } } {
set patterns ""
set expecting_action 0
set expecting_arg 0
+ set cooked 0
foreach item $user_code subst_item $subst_code {
if { $item == "-n" || $item == "-notransfer" || $item == "-nocase" } {
lappend processed_code $item
@@ -835,6 +836,10 @@ proc gdb_test_multiple { command message user_code { prompt_regexp "" } } {
lappend processed_code $item
continue
}
+ if { $item == "-cooked" } {
+ set cooked 1
+ continue
+ }
if { $expecting_arg } {
set expecting_arg 0
lappend processed_code $subst_item
@@ -848,7 +853,14 @@ proc gdb_test_multiple { command message user_code { prompt_regexp "" } } {
continue
}
set expecting_action 1
- lappend processed_code $subst_item
+ if { $cooked } {
+ # Wrap subst_item as is done for the gdb_test PATTERN argument.
+ lappend processed_code \
+ "\[\r\n\]*(?:$subst_item)\[\r\n\]+$gdb_prompt $"
+ set cooked 0
+ } else {
+ lappend processed_code $subst_item
+ }
if {$patterns != ""} {
append patterns "; "
}