<div dir="ltr">Ed - let me know how this change works on FreeBSD. If there are problems with it, I'll yank it.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Apr 21, 2014 at 10:09 AM, Todd Fiala <span dir="ltr"><<a href="mailto:tfiala@google.com" target="_blank">tfiala@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: tfiala<br>
Date: Mon Apr 21 12:09:35 2014<br>
New Revision: 206762<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=206762&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=206762&view=rev</a><br>
Log:<br>
TestPtrRef2Typedef.py change - take 2.<br>
<br>
Our build is still getting this test to fail with the presence of const in<br>
'(Foo &const) y = 0x' and '(Foo &&const) z = 0x'. This change simply changes<br>
the match substrings to ignore the portion after the final '&' and before the<br>
closing ')'. This should cover the presence (or absence) of the const qualifier.<br>
<br>
Modified:<br>
lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py<br>
<br>
Modified: lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py?rev=206762&r1=206761&r2=206762&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py?rev=206762&r1=206761&r2=206762&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py (original)<br>
+++ lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py Mon Apr 21 12:09:35 2014<br>
@@ -58,8 +58,12 @@ class PtrRef2TypedefTestCase(TestBase):<br>
self.runCmd('type summary add --cascade true -s "IntRRef" "int &&"')<br>
<br>
self.expect("frame variable x", substrs = ['(Foo *) x = 0x','IntPointer'])<br>
- self.expect("frame variable y", substrs = ['(Foo &) y = 0x','IntLRef'])<br>
- self.expect("frame variable z", substrs = ['(Foo &&) z = 0x','IntRRef'])<br>
+ # note: Ubuntu 12.04 x86_64 build with gcc 4.8.2 is getting a<br>
+ # const after the ref that isn't showing up on FreeBSD. This<br>
+ # tweak changes the behavior so that the const is not part of<br>
+ # the match.<br>
+ self.expect("frame variable y", substrs = ['(Foo &', ') y = 0x','IntLRef'])<br>
+ self.expect("frame variable z", substrs = ['(Foo &&', ') z = 0x','IntRRef'])<br>
<br>
if __name__ == '__main__':<br>
import atexit<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr"><table cellspacing="0" cellpadding="0" style="color:rgb(136,136,136);font-family:'Times New Roman'"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small">
<td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Todd Fiala |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tfiala@google.com" style="color:rgb(17,85,204)" target="_blank"><span style="background-color:rgb(255,255,204);color:rgb(34,34,34);background-repeat:initial initial">tfiala@google.com</span></a> |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"><font color="#1155cc"> <a>650-943-3180</a></font></td></tr></tbody></table><br></div>
</div>