vendor/lldb/lldb-release_39-r276489

1 files changed, 11 insertions, 5 deletions

diff --git a/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py b/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
index c7a3de4b68467..cfaff91daa45f 100644
--- a/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
+++ b/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
@@ -6,8 +6,9 @@ from __future__ import print_function
 
 import os, time
 import lldb
-import lldbsuite.test.lldbutil as lldbutil
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
 
 class TestCStepping(TestBase):
 
@@ -22,10 +23,10 @@ class TestCStepping(TestBase):
         # Find the line numbers that we will step to in main:
         self.main_source = "main.c"
 
-    @expectedFailureFreeBSD('llvm.org/pr17932')
-    @expectedFailureLinux # llvm.org/pr14437
-    @expectedFailureWindows("llvm.org/pr24777")
     @add_test_categories(['pyapi'])
+    @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr17932')
+    @expectedFailureAll(oslist=["linux"], bugnumber="llvm.org/pr14437")
+    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24777")
     def test_and_python_api(self):
         """Test stepping over vrs. hitting breakpoints & subsequent stepping in various forms."""
         self.build()
@@ -155,9 +156,14 @@ class TestCStepping(TestBase):
         current_file = frame.GetLineEntry().GetFileSpec()
 
         break_in_b.SetEnabled(True)
-        frame.EvaluateExpression ("b (4)", lldb.eNoDynamicValues, False)
+        options = lldb.SBExpressionOptions()
+        options.SetIgnoreBreakpoints(False)
+        options.SetFetchDynamicValue(False)
+        options.SetUnwindOnError(False)
+        frame.EvaluateExpression ("b (4)", options)
 
         threads = lldbutil.get_threads_stopped_at_breakpoint (process, break_in_b)
+
         if len(threads) != 1:
             self.fail ("Failed to stop at breakpoint in b when calling b.")
         thread = threads[0]