<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">Hi,<div>this test case is marked as expected failure on clang due to <a href="http://llvm.org/pr15301">llvm.org/pr15301</a></div><div>After this patch, I see this pass with clang on OS X</div><div>If the test also passes on the Linux side, maybe we should remove the decorator</div><div><br><div>
<div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div style=" orphans: 2; widows: 2; border-collapse: separate; border-spacing: 0px;"><span style="font-size: 12px; orphans: auto; widows: auto;">Enrico Granata</span><br style="font-size: 12px; orphans: auto; widows: auto;"><span style="font-size: 12px; orphans: auto; widows: auto;">📩 egranata@</span><font color="#ff2600" style="font-size: 12px; orphans: auto; widows: auto;"></font><span style="font-size: 12px; orphans: auto; widows: auto;">.com</span><br style="font-size: 12px; orphans: auto; widows: auto;"><span style="font-size: 12px; orphans: auto; widows: auto;">☎️ 27683</span></div></div></div>
</div>
<div><br><div>Begin forwarded message:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; color:rgba(0, 0, 0, 1.0);"><b>From: </b></span><span style="font-family:'Helvetica';">Enrico Granata <<a href="mailto:egranata@apple.com">egranata@apple.com</a>><br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; color:rgba(0, 0, 0, 1.0);"><b>Subject: </b></span><span style="font-family:'Helvetica';"><b>[Lldb-commits] [lldb] r184265 - <<a href="rdar://problem/14086503">rdar://problem/14086503</a>></b><br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; color:rgba(0, 0, 0, 1.0);"><b>Date: </b></span><span style="font-family:'Helvetica';">June 18, 2013 at 5:20:57 PM PDT<br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; color:rgba(0, 0, 0, 1.0);"><b>To: </b></span><span style="font-family:'Helvetica';"><a href="mailto:lldb-commits@cs.uiuc.edu">lldb-commits@cs.uiuc.edu</a><br></span></div><br><div style="font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">Author: enrico<br>Date: Tue Jun 18 19:20:57 2013<br>New Revision: 184265<br><br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project?rev=184265&view=rev">http://llvm.org/viewvc/llvm-project?rev=184265&view=rev</a><br>Log:<br><<a href="rdar://problem/14086503">rdar://problem/14086503</a>><br><br>Hardening the libstdc++ std::map test case against line table changes<br><br><br>Modified:<br> lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py<br> lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp<br><br>Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py?rev=184265&r1=184264&r2=184265&view=diff">http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py?rev=184265&r1=184264&r2=184265&view=diff</a><br>==============================================================================<br>--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py (original)<br>+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py Tue Jun 18 19:20:57 2013<br>@@ -39,7 +39,7 @@ class StdMapDataFormatterTestCase(TestBa<br> """Test that that file and class static variables display correctly."""<br> self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)<br><br>- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)<br>+ lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")<br><br> self.runCmd("run", RUN_SUCCEEDED)<br><br>@@ -68,7 +68,7 @@ class StdMapDataFormatterTestCase(TestBa<br> substrs = ['map has 0 items',<br> '{}'])<br><br>- self.runCmd("n");self.runCmd("n");<br>+ self.runCmd("c");<br><br> self.expect('frame variable ii',<br> substrs = ['map has 2 items',<br>@@ -79,7 +79,7 @@ class StdMapDataFormatterTestCase(TestBa<br> 'first = 1',<br> 'second = 1'])<br><br>- self.runCmd("n");self.runCmd("n");<br>+ self.runCmd("c");<br><br> self.expect('frame variable ii',<br> substrs = ['map has 4 items',<br>@@ -90,8 +90,7 @@ class StdMapDataFormatterTestCase(TestBa<br> 'first = 3',<br> 'second = 1'])<br><br>- self.runCmd("n");self.runCmd("n");<br>- self.runCmd("n");self.runCmd("n");self.runCmd("n");<br>+ self.runCmd("c");<br><br> self.expect("frame variable ii",<br> substrs = ['map has 9 items',<br>@@ -133,20 +132,19 @@ class StdMapDataFormatterTestCase(TestBa<br> #self.expect("expression ii[8]", matching=False, error=True,<br> # substrs = ['1234567'])<br><br>- self.runCmd("n")<br>+ self.runCmd("c")<br><br> self.expect('frame variable ii',<br> substrs = ['map has 0 items',<br> '{}'])<br><br>- self.runCmd("n")<br> self.runCmd("frame variable si --show-types")<br><br> self.expect('frame variable si',<br> substrs = ['map has 0 items',<br> '{}'])<br><br>- self.runCmd("n")<br>+ self.runCmd("c")<br><br> self.expect('frame variable si',<br> substrs = ['map has 1 items',<br>@@ -154,7 +152,7 @@ class StdMapDataFormatterTestCase(TestBa<br> 'first = \"zero\"',<br> 'second = 0'])<br><br>- self.runCmd("n");self.runCmd("n");self.runCmd("n");self.runCmd("n");<br>+ self.runCmd("c");<br><br> self.expect("frame variable si",<br> substrs = ['map has 5 items',<br>@@ -208,20 +206,19 @@ class StdMapDataFormatterTestCase(TestBa<br> #self.expect("expression si[0]", matching=False, error=True,<br> # substrs = ['first = ', 'zero'])<br><br>- self.runCmd("n")<br>+ self.runCmd("c")<br><br> self.expect('frame variable si',<br> substrs = ['map has 0 items',<br> '{}'])<br><br>- self.runCmd("n")<br> self.runCmd("frame variable is --show-types")<br><br> self.expect('frame variable is',<br> substrs = ['map has 0 items',<br> '{}'])<br><br>- self.runCmd("n");self.runCmd("n");self.runCmd("n");self.runCmd("n");<br>+ self.runCmd("c");<br><br> self.expect("frame variable is",<br> substrs = ['map has 4 items',<br>@@ -269,20 +266,19 @@ class StdMapDataFormatterTestCase(TestBa<br> #self.expect("expression is[0]", matching=False, error=True,<br> # substrs = ['first = ', 'goofy'])<br><br>- self.runCmd("n")<br>+ self.runCmd("c")<br><br> self.expect('frame variable is',<br> substrs = ['map has 0 items',<br> '{}'])<br><br>- self.runCmd("n")<br> self.runCmd("frame variable ss --show-types")<br><br> self.expect('frame variable ss',<br> substrs = ['map has 0 items',<br> '{}'])<br><br>- self.runCmd("n");self.runCmd("n");self.runCmd("n");self.runCmd("n");<br>+ self.runCmd("c");<br><br> self.expect("frame variable ss",<br> substrs = ['map has 4 items',<br>@@ -329,7 +325,7 @@ class StdMapDataFormatterTestCase(TestBa<br> #self.expect("expression ss[3]", matching=False, error=True,<br> # substrs = ['gatto'])<br><br>- self.runCmd("n")<br>+ self.runCmd("c")<br><br> self.expect('frame variable ss',<br> substrs = ['map has 0 items',<br><br>Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp?rev=184265&r1=184264&r2=184265&view=diff">http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp?rev=184265&r1=184264&r2=184265&view=diff</a><br>==============================================================================<br>--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp (original)<br>+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp Tue Jun 18 19:20:57 2013<br>@@ -13,43 +13,43 @@ int main()<br><br> ii[0] = 0; // Set break point at this line.<br> ii[1] = 1;<br>- ii[2] = 0;<br>+ ii[2] = 0;// Set break point at this line.<br> ii[3] = 1;<br>- ii[4] = 0;<br>+ ii[4] = 0;// Set break point at this line.<br> ii[5] = 1;<br> ii[6] = 0;<br> ii[7] = 1;<br> ii[85] = 1234567;<br><br>- ii.clear();<br>+ ii.clear();// Set break point at this line.<br><br> strint_map si;<br><br>- si["zero"] = 0;<br>- si["one"] = 1;<br>+ si["zero"] = 0;// Set break point at this line.<br>+ si["one"] = 1;// Set break point at this line.<br> si["two"] = 2;<br> si["three"] = 3;<br> si["four"] = 4;<br><br>- si.clear();<br>+ si.clear();// Set break point at this line.<br><br> intstr_map is;<br><br>- is[85] = "goofy";<br>+ is[85] = "goofy";// Set break point at this line.<br> is[1] = "is";<br> is[2] = "smart";<br> is[3] = "!!!";<br><br>- is.clear();<br>+ is.clear();// Set break point at this line.<br><br> strstr_map ss;<br><br>- ss["ciao"] = "hello";<br>+ ss["ciao"] = "hello";// Set break point at this line.<br> ss["casa"] = "house";<br> ss["gatto"] = "cat";<br> ss["a Mac.."] = "..is always a Mac!";<br><br>- ss.clear();<br>+ ss.clear();// Set break point at this line.<br><br>- return 0;<br>+ return 0;// Set break point at this line.<br>}<br>\ No newline at end of file<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">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a></div></blockquote></div><br></div></body></html>