From f3fbd1c0586ff6ec7895991e6c28f61a503c36a8 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 23 Jul 2016 20:50:09 +0000 Subject: Vendor import of lldb release_39 branch r276489: https://llvm.org/svn/llvm-project/lldb/branches/release_39@276489 --- .../breakpoint/breakpoint_command/TestBreakpointCommand.py | 7 ++++--- .../breakpoint_command/TestBreakpointCommandsFromPython.py | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command') diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py index 8cf7539432ba..78d14b7d7705 100644 --- a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py +++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py @@ -8,8 +8,9 @@ from __future__ import print_function import os, time import lldb +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * -import lldbsuite.test.lldbutil as lldbutil +from lldbsuite.test import lldbutil class BreakpointCommandTestCase(TestBase): @@ -21,7 +22,7 @@ class BreakpointCommandTestCase(TestBase): cls.RemoveTempFile("output.txt") cls.RemoveTempFile("output2.txt") - @expectedFailureWindows("llvm.org/pr24528") + @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528") def test(self): """Test a sequence of breakpoint command add, list, and delete.""" self.build() @@ -142,7 +143,7 @@ class BreakpointCommandTestCase(TestBase): self.expect("breakpoint command list 1", startstr = "Breakpoint 1 does not have an associated command.") self.expect("breakpoint command list 2", error=True, - startstr = "error: '2' is not a currently valid breakpoint id.") + startstr = "error: '2' is not a currently valid breakpoint ID.") # The breakpoint list now only contains breakpoint 1. self.expect("breakpoint list -f", "Breakpoint 1 exists", diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py index 7a9cc744d528..4f8ab9e115de 100644 --- a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py +++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py @@ -8,10 +8,11 @@ from __future__ import print_function import os import re -import lldb -import lldbsuite.test.lldbutil as lldbutil import sys +import lldb +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * +from lldbsuite.test import lldbutil class PythonBreakpointCommandSettingTestCase(TestBase): -- cgit v1.2.3