[debuginfo-tests] r190967 - Massage those regexps to work with both lldb and gdb.

[Eric Christopher]

Yep! Last one got it.

Thanks!

-eric

On Wed, Sep 18, 2013 at 4:08 PM, Adrian Prantl <aprantl at apple.com> wrote:
> better now?
>
> -- adrian
>
>
> On Sep 18, 2013, at 4:04 PM, Eric Christopher <echristo at gmail.com> wrote:
>
>> Close! :)
>>
>> sret is still failing:
>>
>> sources/llvm/tools/clang/test/debuginfo-tests/sret.cpp:10:16: error:
>> CHECK-NEXT: is on the same line as previous match
>> // CHECK-NEXT: {{(_vptr\$A =)?.*}}m_int = 12
>>               ^
>> builds/build-llvm/tools/clang/test/debuginfo-tests/Output/sret.cpp.gdb.output:5:7:
>> note: 'next' match was here
>> $1 = {_vptr$A = 0x400b10 <vtable for A+16>, m_int = 12}
>>      ^
>> /builds/build-llvm/tools/clang/test/debuginfo-tests/Output/sret.cpp.gdb.output:5:7:
>> note: previous match ended here
>> $1 = {_vptr$A = 0x400b10 <vtable for A+16>, m_int = 12}
>>
>> -eric
>>
>>
>> On Wed, Sep 18, 2013 at 3:56 PM, Adrian Prantl <aprantl at apple.com> wrote:
>>> Author: adrian
>>> Date: Wed Sep 18 17:56:35 2013
>>> New Revision: 190967
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=190967&view=rev
>>> Log:
>>> Massage those regexps to work with both lldb and gdb.
>>>
>>> Modified:
>>>    debuginfo-tests/trunk/aggregate-indirect-arg.cpp
>>>    debuginfo-tests/trunk/sret.cpp
>>>
>>> Modified: debuginfo-tests/trunk/aggregate-indirect-arg.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/debuginfo-tests/trunk/aggregate-indirect-arg.cpp?rev=190967&r1=190966&r2=190967&view=diff
>>> ==============================================================================
>>> --- debuginfo-tests/trunk/aggregate-indirect-arg.cpp (original)
>>> +++ debuginfo-tests/trunk/aggregate-indirect-arg.cpp Wed Sep 18 17:56:35 2013
>>> @@ -6,8 +6,8 @@
>>> // DEBUGGER: r
>>> // DEBUGGER: p v
>>> // CHECK: ${{[0-9]+}} = {
>>> -// CHECK-NEXT:  Data = 0x0{{,|(0+$)}}
>>> -// CHECK-NEXT:  Kind = 2142
>>> +// CHECK:  Data = 0x0{{(0*)}}
>>> +// CHECK:  Kind = 2142
>>>
>>> class SVal {
>>> public:
>>>
>>> Modified: debuginfo-tests/trunk/sret.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/debuginfo-tests/trunk/sret.cpp?rev=190967&r1=190966&r2=190967&view=diff
>>> ==============================================================================
>>> --- debuginfo-tests/trunk/sret.cpp (original)
>>> +++ debuginfo-tests/trunk/sret.cpp Wed Sep 18 17:56:35 2013
>>> @@ -7,8 +7,7 @@
>>> // DEBUGGER: p a
>>> // CHECK: ${{[0-9]+}} = {
>>> // LLDB does not print artificial members.
>>> -// CHECK-NEXT:  {{(_vptr\$A =)|(m_int = 12)}}
>>> -// CHECK-NEXT:  {{(m_int = 12)|(})}}
>>> +// CHECK-NEXT:  {{(_vptr\$A =)?.*}}m_int = 12
>>>
>>> class A
>>> {
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>