diff options
-rw-r--r-- | lldb/test/functionalities/register/TestRegisters.py | 19 | ||||
-rw-r--r-- | lldb/test/settings/TestSettings.py | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/lldb/test/functionalities/register/TestRegisters.py b/lldb/test/functionalities/register/TestRegisters.py index 93ff6dd9fcf..7b4f1a51634 100644 --- a/lldb/test/functionalities/register/TestRegisters.py +++ b/lldb/test/functionalities/register/TestRegisters.py @@ -19,42 +19,43 @@ class RegisterCommandsTestCase(TestBase): def test_register_commands(self): """Test commands related to registers, in particular vector registers.""" - if not self.getArchitecture() in ['i386', 'x86_64']: - self.skipTest("This test requires i386 or x86_64 as the architecture for the inferior") + if not self.getArchitecture() in ['amd64', 'i386', 'x86_64']: + self.skipTest("This test requires x86 or x86_64 as the architecture for the inferior") self.buildDefault() self.register_commands() def test_fp_register_write(self): """Test commands that write to registers, in particular floating-point registers.""" - if not self.getArchitecture() in ['i386', 'x86_64']: - self.skipTest("This test requires i386 or x86_64 as the architecture for the inferior") + if not self.getArchitecture() in ['amd64', 'i386', 'x86_64']: + self.skipTest("This test requires x86 or x86_64 as the architecture for the inferior") self.buildDefault() self.fp_register_write() def test_register_expressions(self): """Test expression evaluation with commands related to registers.""" - if not self.getArchitecture() in ['i386', 'x86_64']: - self.skipTest("This test requires i386 or x86_64 as the architecture for the inferior") + if not self.getArchitecture() in ['amd64', 'i386', 'x86_64']: + self.skipTest("This test requires x86 or x86_64 as the architecture for the inferior") self.buildDefault() self.register_expressions() def test_convenience_registers(self): """Test convenience registers.""" - if not self.getArchitecture() in ['x86_64']: + if not self.getArchitecture() in ['amd64', 'x86_64']: self.skipTest("This test requires x86_64 as the architecture for the inferior") self.buildDefault() self.convenience_registers() def test_convenience_registers_with_process_attach(self): """Test convenience registers after a 'process attach'.""" - if not self.getArchitecture() in ['x86_64']: + if not self.getArchitecture() in ['amd64', 'x86_64']: self.skipTest("This test requires x86_64 as the architecture for the inferior") self.buildDefault() self.convenience_registers_with_process_attach(test_16bit_regs=False) + @expectedFailureFreeBSD("llvm.org/pr18200") def test_convenience_registers_16bit_with_process_attach(self): """Test convenience registers after a 'process attach'.""" - if not self.getArchitecture() in ['x86_64']: + if not self.getArchitecture() in ['amd64', 'x86_64']: self.skipTest("This test requires x86_64 as the architecture for the inferior") self.buildDefault() self.convenience_registers_with_process_attach(test_16bit_regs=True) diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py index c45478cc9f5..a02e5d080fa 100644 --- a/lldb/test/settings/TestSettings.py +++ b/lldb/test/settings/TestSettings.py @@ -165,7 +165,7 @@ class SettingsCommandTestCase(TestBase): self.expect("settings show auto-confirm", SETTING_MSG("auto-confirm"), startstr = "auto-confirm (boolean) = false") - @unittest2.skipUnless(os.uname()[4] in ['i386', 'x86_64'], "requires x86 or x86_64") + @unittest2.skipUnless(os.uname()[4] in ['amd64', 'i386', 'x86_64'], "requires x86 or x86_64") def test_disassembler_settings(self): """Test that user options for the disassembler take effect.""" self.buildDefault() |