Index: lldb/trunk/test/lldbtest.py
===================================================================
--- lldb/trunk/test/lldbtest.py
+++ lldb/trunk/test/lldbtest.py
@@ -664,6 +664,11 @@
         return arch in self.getArchitecture()
     return expectedFailure(fn, bugnumber)
 
+def skipUnlessArch(arch):
+    def fn(self):
+        return not self.getArchitecture() in arch 
+    return expectedFailure(fn, None)
+
 def expectedFailurei386(bugnumber=None):
     return expectedFailureArch('i386', bugnumber)
 
Index: lldb/trunk/test/settings/TestSettings.py
===================================================================
--- lldb/trunk/test/settings/TestSettings.py
+++ lldb/trunk/test/settings/TestSettings.py
@@ -165,8 +165,7 @@
         self.expect("settings show auto-confirm", SETTING_MSG("auto-confirm"),
             startstr = "auto-confirm (boolean) = false")
 
-    @expectedFailureArch("arm")
-    @expectedFailureArch("aarch64")
+    @skipUnlessArch(['x86-64', 'i386'])
     def test_disassembler_settings(self):
         """Test that user options for the disassembler take effect."""
         self.buildDefault()