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

lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py

@@ -16,9 +16,9 @@ class TestMultipleSimultaneousDebuggers(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipIfi386
     @skipIfNoSBHeaders
     @expectedFlakeyDarwin()
+    @expectedFailureAll(archs="i[3-6]86", bugnumber="multi-process-driver.cpp creates an x64 target")
     @expectedFailureAll(oslist=["windows", "linux", "freebsd"], bugnumber="llvm.org/pr20282")
     def test_multiple_debuggers(self):
         env = {self.dylibPath : self.getLLDBLibraryEnvVal()}

lldb/packages/Python/lldbsuite/test/decorators.py

@@ -316,15 +316,6 @@ def expectedFailureGcc(bugnumber=None, compiler_version=None):
 def expectedFailureIcc(bugnumber=None):
     return expectedFailureCompiler('icc', None, bugnumber)
 
-def expectedFailureArch(arch, bugnumber=None):
-    return expectedFailureAll(archs=arch, bugnumber=bugnumber)
-
-def expectedFailurei386(bugnumber=None):
-    return expectedFailureArch('i386', bugnumber)
-
-def expectedFailurex86_64(bugnumber=None):
-    return expectedFailureArch('x86_64', bugnumber)
-
 def expectedFailureOS(oslist, bugnumber=None, compilers=None, debug_info=None, archs=None):
     return expectedFailureAll(oslist=oslist, bugnumber=bugnumber, compiler=compilers, archs=archs, debug_info=debug_info)
 
@@ -570,10 +561,6 @@ def skipIfIcc(func):
     """Decorate the item to skip tests that should be skipped if building with icc ."""
     return skipIf(compiler="icc")(func)
 
-def skipIfi386(func):
-    """Decorate the item to skip tests that should be skipped if building 32-bit."""
-    return skipIf(archs="i386")(func)
-
 def skipIfTargetAndroid(api_levels=None, archs=None):
     """Decorator to skip tests when the target is Android.
 

lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py

@@ -57,15 +57,13 @@ class ExprCharTestCase(TestBase):
     def test_default_char(self):
         self.do_test()
 
-    @expectedFailureArch("arm", "llvm.org/pr23069")
-    @expectedFailureArch("aarch64", "llvm.org/pr23069")
+    @expectedFailureAll(archs=["arm, aarch64"], bugnumber="llvm.org/pr23069")
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21765")
     def test_signed_char(self):
         self.do_test(dictionary={'CFLAGS_EXTRAS': '-fsigned-char'})
 
-    @expectedFailurei386("llvm.org/pr23069")
-    @expectedFailurex86_64("llvm.org/pr23069")
+    @expectedFailureAll(archs=["i[3-6]86", "x86_x64"], bugnumber="llvm.org/pr23069")
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21765")
-    @expectedFailureAll(bugnumber="llvm.org/pr23069", triple = 'mips*')
+    @expectedFailureAll(triple = 'mips*', bugnumber="llvm.org/pr23069")
     def test_unsigned_char(self):
         self.do_test(dictionary={'CFLAGS_EXTRAS': '-funsigned-char'})

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()

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()

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):

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}

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."""

lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

@@ -206,7 +206,7 @@ class MiExecTestCase(lldbmi_testcase.MiTestCaseBase):
 
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
-    @expectedFailurei386 #xfail to get buildbot green, failing config: i386 binary running on ubuntu 14.04 x86_64
+    @expectedFailureAll(archs=["i[3-6]86"], bugnumber="xfail to get buildbot green, failing config: i386 binary running on ubuntu 14.04 x86_64")
     def test_lldbmi_exec_next_instruction(self):
         """Test that 'lldb-mi --interpreter' works for instruction stepping."""