Make several test case arm32 compatible

llvm-svn: 235172

4 files changed, 9 insertions, 3 deletions

diff --git a/lldb/test/expression_command/char/TestExprsChar.py b/lldb/test/expression_command/char/TestExprsChar.py
index fdebf216da6..a3574bb9eb5 100644
--- a/lldb/test/expression_command/char/TestExprsChar.py
+++ b/lldb/test/expression_command/char/TestExprsChar.py
@@ -52,7 +52,8 @@ class ExprCharTestCase(TestBase):
     def test_default_char(self):
         self.do_test()
 
-    
+    @expectedFailureArch("arm", "llvm.org/pr23069")
+    @expectedFailureArch("aarch64", "llvm.org/pr23069")
     def test_signed_char(self):
         self.do_test(dictionary={'CFLAGS_EXTRAS': '-fsigned-char'})
 
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
index 569bad6e2f3..a60a917e8af 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
@@ -128,8 +128,10 @@ class BreakpointConditionsTestCase(TestBase):
             self.runCmd("breakpoint modify -c ($eax&&i)")
         elif self.getArchitecture() in ['aarch64']:
             self.runCmd("breakpoint modify -c ($x1&&i)")
+        elif self.getArchitecture() in ['arm']:
+            self.runCmd("breakpoint modify -c ($r0&&i)")
         self.runCmd("run")
-        
+
         self.expect("process status", PROCESS_STOPPED,
             patterns = ['Process .* stopped'])
 
diff --git a/lldb/test/lldbplatformutil.py b/lldb/test/lldbplatformutil.py
index ef045bbe2eb..e23a0ef0efc 100644
--- a/lldb/test/lldbplatformutil.py
+++ b/lldb/test/lldbplatformutil.py
@@ -4,6 +4,8 @@ architecture and/or the platform dependent nature of the tests. """
 def check_first_register_readable(test_case):
     if test_case.getArchitecture() in ['x86_64', 'i386']:
         test_case.expect("register read eax", substrs = ['eax = 0x'])
+    elif test_case.getArchitecture() in ['arm']:
+    	test_case.expect("register read r0", substrs = ['r0 = 0x'])
     elif test_case.getArchitecture() in ['aarch64']:
         test_case.expect("register read x0", substrs = ['x0 = 0x'])
     else:
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index 2cb9afb81bb..5d0f3296760 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -165,7 +165,8 @@ class SettingsCommandTestCase(TestBase):
         self.expect("settings show auto-confirm", SETTING_MSG("auto-confirm"),
             startstr = "auto-confirm (boolean) = false")
 
-    @unittest2.skipUnless(os.name != "nt" and os.uname()[4] in ['amd64', 'i386', 'x86_64'], "requires x86 or x86_64")
+    @expectedFailureArch("arm")
+    @expectedFailureArch("aarch64")
     def test_disassembler_settings(self):
         """Test that user options for the disassembler take effect."""
         self.buildDefault()