[Lldb-commits] [lldb] r206762 - TestPtrRef2Typedef.py change - take 2.

[Todd Fiala]

Author: tfiala
Date: Mon Apr 21 12:09:35 2014
New Revision: 206762

URL: http://llvm.org/viewvc/llvm-project?rev=206762&view=rev
Log:
TestPtrRef2Typedef.py change - take 2.

Our build is still getting this test to fail with the presence of const in
'(Foo &const) y = 0x' and '(Foo &&const) z = 0x'.  This change simply changes
the match substrings to ignore the portion after the final '&' and before the
closing ')'.  This should cover the presence (or absence) of the const qualifier.

Modified:
    lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py

Modified: lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
URL: 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
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py Mon Apr 21 12:09:35 2014
@@ -58,8 +58,12 @@ class PtrRef2TypedefTestCase(TestBase):
         self.runCmd('type summary add --cascade true -s "IntRRef" "int &&"')
 
         self.expect("frame variable x", substrs = ['(Foo *) x = 0x','IntPointer'])
-        self.expect("frame variable y", substrs = ['(Foo &) y = 0x','IntLRef'])
-        self.expect("frame variable z", substrs = ['(Foo &&) z = 0x','IntRRef'])
+        # note: Ubuntu 12.04 x86_64 build with gcc 4.8.2 is getting a
+        # const after the ref that isn't showing up on FreeBSD. This
+        # tweak changes the behavior so that the const is not part of
+        # the match.
+        self.expect("frame variable y", substrs = ['(Foo &', ') y = 0x','IntLRef'])
+        self.expect("frame variable z", substrs = ['(Foo &&', ') z = 0x','IntRRef'])
 
 if __name__ == '__main__':
     import atexit