From 05021bb2ed04dffab3a51bfb7572ee273fb9c8aa Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Tue, 9 Feb 2016 00:36:34 +0000 Subject: Remove skip and xfail decorators for target architecture. This removes the following decorators: * skipIfI386 * expectedFailureI386 * expectedFailurex86_64 * skipIfArch * skipUnlessArch * skipUnlessI386 And other related decorators. All code using those decorators is updated to use expectedFailureAll and skipIf llvm-svn: 260178 --- .../Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py | 2 +- .../Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py | 2 +- .../lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py | 2 +- .../lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py | 2 +- .../Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/lang') diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py index 565ffad105d..9fa03071c59 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py @@ -24,7 +24,7 @@ class TestObjCIvarsInBlocks(TestBase): @skipUnlessDarwin @add_test_categories(['pyapi']) - @expectedFailurei386 # This test requires the 2.0 runtime, so it will fail on i386. + @expectedFailureAll(archs=["i[3-6]86"], bugnumber="This test requires the 2.0 runtime, so it will fail on i386") def test_with_python_api(self): """Test printing the ivars of the self when captured in blocks""" self.build() diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py index c0947d7cd4a..0664b2c320a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py @@ -135,7 +135,7 @@ class FoundationTestCase2(TestBase): patterns = ["\(MyString\) \$.* = ", "\(MyBase\)", "\(NSObject\)", "\(Class\)"]) self.runCmd("process continue") - @expectedFailurei386 + @expectedFailureAll(archs=["i[3-6]86"]) def test_NSError_po(self): """Test that po of the result of an unknown method doesn't require a cast.""" self.build() diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py index 8e7b1756328..a5767562c07 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py @@ -22,7 +22,7 @@ class TestObjCClassMethod(TestBase): self.break_line = line_number(self.main_source, '// Set breakpoint here.') @skipUnlessDarwin - @expectedFailurei386 + @expectedFailureAll(archs=["i[3-6]86"]) @add_test_categories(['pyapi']) #rdar://problem/9745789 "expression" can't call functions in class methods def test_with_python_api(self): diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py index 864c4979b5a..fc8a8129fa3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py @@ -26,7 +26,7 @@ class ObjCDynamicSBTypeTestCase(TestBase): self.main_source = "main.m" self.line = line_number(self.main_source, '// Set breakpoint here.') - @skipIfi386 + @skipIf(archs="i[3-6]86") def test_dyn(self): """Test that we are able to properly report a usable dynamic type.""" d = {'EXE': self.exe_name} diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py index 794bccdb81a..39a0fb716ab 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py @@ -22,7 +22,7 @@ class TestObjCSuperMethod(TestBase): self.break_line = line_number(self.main_source, '// Set breakpoint here.') @skipUnlessDarwin - @expectedFailurei386 + @expectedFailureAll(archs=["i[3-6]86"]) @add_test_categories(['pyapi']) def test_with_python_api(self): """Test calling methods on super.""" -- cgit v1.2.3