From: Matt Kopec Date: Fri, 1 Mar 2013 17:29:16 +0000 (+0000) Subject: Update TestCallStdStringFunction to expected fail for gcc and account for multiple... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c51b243a4346ba4c6665221d030e67ffa836f6d2;p=platform%2Fupstream%2Fllvm.git Update TestCallStdStringFunction to expected fail for gcc and account for multiple breakpoint locations. Patch from Ashok Thirumurthi. llvm-svn: 176357 --- diff --git a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py index 3c8f66a..ed24c44 100644 --- a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py +++ b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py @@ -25,8 +25,8 @@ class ExprCommandCallFunctionTestCase(TestBase): self.buildDsym() self.call_function() - @skipOnLinux #PR-15256: assertion failure in RecordLayoutBuilder::updateExternalFieldOffset @dwarf_test + @expectedFailureGcc # bugzilla 14437, fails with GCC 4.6.3 and 4.7.2 def test_with_dwarf(self): """Test calling std::String member function.""" self.buildDwarf() @@ -36,7 +36,8 @@ class ExprCommandCallFunctionTestCase(TestBase): """Test calling std::String member function.""" self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) - lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, loc_exact=True) + # Some versions of GCC encode two locations for the 'return' statement in main.cpp + lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1, loc_exact=True) self.runCmd("run", RUN_SUCCEEDED)