[Lldb-commits] [lldb] r196920 - test: FreeBSD calls the 64-bit x86 platform amd64

[Ed Maste]

Author: emaste
Date: Tue Dec 10 08:25:28 2013
New Revision: 196920

URL: http://llvm.org/viewvc/llvm-project?rev=196920&view=rev
Log:
test: FreeBSD calls the 64-bit x86 platform amd64

Also add decorator for an issue that this uncovered: llvm.org/pr18200

Modified:
    lldb/trunk/test/functionalities/register/TestRegisters.py
    lldb/trunk/test/settings/TestSettings.py

Modified: lldb/trunk/test/functionalities/register/TestRegisters.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/register/TestRegisters.py?rev=196920&r1=196919&r2=196920&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/register/TestRegisters.py (original)
+++ lldb/trunk/test/functionalities/register/TestRegisters.py Tue Dec 10 08:25:28 2013
@@ -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)

Modified: lldb/trunk/test/settings/TestSettings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/settings/TestSettings.py?rev=196920&r1=196919&r2=196920&view=diff
==============================================================================
--- lldb/trunk/test/settings/TestSettings.py (original)
+++ lldb/trunk/test/settings/TestSettings.py Tue Dec 10 08:25:28 2013
@@ -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()