diff options
Diffstat (limited to 'packages/Python/lldbsuite/test/lldbplatformutil.py')
| -rw-r--r-- | packages/Python/lldbsuite/test/lldbplatformutil.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packages/Python/lldbsuite/test/lldbplatformutil.py b/packages/Python/lldbsuite/test/lldbplatformutil.py index 4f45643241ed2..f7da58bd5259c 100644 --- a/packages/Python/lldbsuite/test/lldbplatformutil.py +++ b/packages/Python/lldbsuite/test/lldbplatformutil.py @@ -25,9 +25,9 @@ def check_first_register_readable(test_case): if arch in ['x86_64', 'i386']: test_case.expect("register read eax", substrs=['eax = 0x']) - elif arch in ['arm']: + elif arch in ['arm', 'armv7', 'armv7k']: test_case.expect("register read r0", substrs=['r0 = 0x']) - elif arch in ['aarch64']: + elif arch in ['aarch64', 'arm64']: test_case.expect("register read x0", substrs=['x0 = 0x']) elif re.match("mips", arch): test_case.expect("register read zero", substrs=['zero = 0x']) @@ -100,8 +100,7 @@ def finalize_build_dictionary(dictionary): if dictionary is None: dictionary = {} dictionary["OS"] = "Android" - if android_device_api() >= 16: - dictionary["PIE"] = 1 + dictionary["PIE"] = 1 return dictionary @@ -123,7 +122,7 @@ def getHostPlatform(): def getDarwinOSTriples(): - return ['darwin', 'macosx', 'ios'] + return ['darwin', 'macosx', 'ios', 'watchos', 'tvos', 'bridgeos'] def getPlatform(): @@ -175,6 +174,6 @@ def createPlatformContext(): def hasChattyStderr(test_case): """Some targets produce garbage on the standard error output. This utility function determines whether the tests can be strict about the expected stderr contents.""" - if match_android_device(test_case.getArchitecture(), ['aarch64'], [22]): + if match_android_device(test_case.getArchitecture(), ['aarch64'], range(22, 25+1)): return True # The dynamic linker on the device will complain about unknown DT entries return False |