test: Move amd64 -> x86_64 translation to getArchitecture()

Rather than sprinkling this knowledge throughout the test suite, just
translate amd64 to x86_64 globally.

llvm-svn: 234166

diff --git a/lldb/test/lldbplatformutil.py b/lldb/test/lldbplatformutil.py
index 63ff740..ef045bb 100644 (file)
--- a/lldb/test/lldbplatformutil.py
+++ b/lldb/test/lldbplatformutil.py
@@ -2,7 +2,7 @@
 architecture and/or the platform dependent nature of the tests. """
 
 def check_first_register_readable(test_case):
-    if test_case.getArchitecture() in ['amd64', 'x86_64', 'i386']:
+    if test_case.getArchitecture() in ['x86_64', 'i386']:
         test_case.expect("register read eax", substrs = ['eax = 0x'])
     elif test_case.getArchitecture() in ['aarch64']:
         test_case.expect("register read x0", substrs = ['x0 = 0x'])

diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index e11bd01..501aae9 100644 (file)
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -1364,7 +1364,10 @@ class Base(unittest2.TestCase):
     def getArchitecture(self):
         """Returns the architecture in effect the test suite is running with."""
         module = builder_module()
-        return module.getArchitecture()
+        arch = module.getArchitecture()
+        if arch == 'amd64':
+            arch = 'x86_64'
+        return arch
 
     def getCompiler(self):
         """Returns the compiler in effect the test suite is running with."""