[Lldb-commits] [lldb] r150854 - in /lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map: TestDataFormatterStdMap.py main.cpp

[Enrico Granata]

Author: enrico
Date: Fri Feb 17 18:29:33 2012
New Revision: 150854

URL: http://llvm.org/viewvc/llvm-project?rev=150854&view=rev
Log:
making it so that the std::map test case does a better job at checking for interference between expression parser and synthetic children; plus being more verbose in the comments

Modified:
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/TestDataFormatterStdMap.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/main.cpp

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/TestDataFormatterStdMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/TestDataFormatterStdMap.py?rev=150854&r1=150853&r2=150854&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/TestDataFormatterStdMap.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/TestDataFormatterStdMap.py Fri Feb 17 18:29:33 2012
@@ -115,9 +115,13 @@
                     substrs = ['first =',
                                'second =']);
         
-        # but check that expression does not rely on us
-        self.expect("expression ii[0]", matching=False, error=True,
-                    substrs = ['first = 0'])
+        self.expect("frame variable ii[8]", matching=True,
+                    substrs = ['1234567'])
+
+        # check that the expression parser does not make use of
+        # synthetic children instead of running code
+        self.expect("expression ii[8]", matching=False, error=True,
+                    substrs = ['1234567'])
 
         self.runCmd("n")
         
@@ -186,7 +190,8 @@
                     substrs = ['first = ', 'four',
                                'second = 4']);
         
-        # but check that expression does not rely on us
+        # check that the expression parser does not make use of
+        # synthetic children instead of running code
         self.expect("expression si[0]", matching=False, error=True,
                     substrs = ['first = ', 'zero'])
 
@@ -212,7 +217,7 @@
                     substrs = ['map has 4 items',
                                '[0] = ',
                                'second = \"goofy\"',
-                               'first = 0',
+                               'first = 85',
                                '[1] = ',
                                'second = \"is\"',
                                'first = 1',
@@ -227,7 +232,7 @@
                     substrs = ['map has 4 items',
                                '[0] = ',
                                'second = \"goofy\"',
-                               'first = 0',
+                               'first = 85',
                                '[1] = ',
                                'second = \"is\"',
                                'first = 1',
@@ -240,10 +245,11 @@
 
         # check access-by-index
         self.expect("frame variable is[0]",
-                    substrs = ['first = ', '0',
-                               'second =', 'goofy']);
+                    substrs = ['first = ',
+                               'second =']);
         
-        # but check that expression does not rely on us
+        # check that the expression parser does not make use of
+        # synthetic children instead of running code
         self.expect("expression is[0]", matching=False, error=True,
                     substrs = ['first = ', 'goofy'])
 
@@ -296,7 +302,8 @@
         self.expect("frame variable ss[3]",
                     substrs = ['gatto', 'cat']);
         
-        # but check that expression does not rely on us
+        # check that the expression parser does not make use of
+        # synthetic children instead of running code
         self.expect("expression ss[3]", matching=False, error=True,
                     substrs = ['gatto'])
 

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/main.cpp?rev=150854&r1=150853&r2=150854&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/main.cpp (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/map/main.cpp Fri Feb 17 18:29:33 2012
@@ -19,7 +19,7 @@
     ii[5] = 1;
     ii[6] = 0;
     ii[7] = 1;
-    ii[8] = 0;
+    ii[85] = 1234567;
     
     ii.clear();
     
@@ -35,7 +35,7 @@
     
     intstr_map is;
     
-    is[0] = "goofy";
+    is[85] = "goofy";
     is[1] = "is";
     is[2] = "smart";
     is[3] = "!!!";