On 03/18/2015 03:12 PM, Joel Brobecker wrote:
>> How about making multi_line join with strict "\r\n" too? Then if
>> you need to match one empty line, you can do:
>>
>>           [multi_line "line1" \
>> 	             ""
>>                       "line3"]
>>
>> and if you need multiple, you can always do:
>>
>>           [multi_line "line1" \
>> 	             "\[\r\n\]*"
>>                       "lineNN"]
>
> Very good suggestion, I like it! Pierre-Marie?

I do like it too: thank you for the suggestion! Here is the updated 
patch: I moved multi_line to gdb.exp, updated it according to what you 
said and updated all testcases matching "[join [list" to use it. The 
good news is that it seems no testcase actually needs the [\r\n]* laxism.

Still no regression (tested on x86_64-linux).

gdb/testsuite/ChangeLog:
2015-03-20  Pierre-Marie de Rodat  <derodat@adacore.com>

         * gdb.ada/complete.exp: Remove "multi_line".
         * gdb.ada/info_exc.exp: Remove "multi_line".
         * gdb.ada/packed_tagged.exp: Remove "multi_line".
         * gdb.ada/ptype_field.exp: Remove "multi_line".
         * gdb.ada/sym_print_name.exp: Remove "multi_line".
         * gdb.ada/tagged.exp: Remove "multi_line".
         * gdb.btrace/buffer-size.exp: Replace [join [list ...]] with
         [multi_line ...]
         * gdb.btrace/delta.exp: Likewise.
         * gdb.btrace/exception.exp: Likewise.
         * gdb.btrace/finish.exp: Likewise.
         * gdb.btrace/function_call_history.exp: Likewise.
         * gdb.btrace/instruction_history.exp: Likewise.
         * gdb.btrace/next.exp: Likewise.
         * gdb.btrace/nexti.exp: Likewise.
         * gdb.btrace/nohist.exp: Likewise.
         * gdb.btrace/record_goto.exp: Likewise.
         * gdb.btrace/segv.exp: Likewise.
         * gdb.btrace/step.exp: Likewise.
         * gdb.btrace/stepi.exp: Likewise.
         * gdb.btrace/tailcall.exp: Likewise.
         * gdb.btrace/unknown_functions.exp: Likewise.
         * gdb.dwarf2/dw2-undefined-ret-addr.exp: Likewise.
         * lib/gdb.exp: Add the "multi_line" helper.

-- 
Pierre-Marie de Rodat