Author: Adrian Prantl Date: 2020-03-06T11:28:31-08:00 New Revision: 33b696b57acb6f944cbf22bf81274713c803329e
URL: https://github.com/llvm/llvm-project/commit/33b696b57acb6f944cbf22bf81274713c803329e DIFF: https://github.com/llvm/llvm-project/commit/33b696b57acb6f944cbf22bf81274713c803329e.diff LOG: Fix test broken by simulator triple changes. Added: Modified: lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py Removed: ################################################################################ diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp index 324a0d07c125..0c471007a305 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp @@ -400,6 +400,15 @@ bool DynamicLoaderDarwin::JSONImageInformationIntoImageInfo( else if (os_name == "maccatalyst") { image_infos[i].os_type = llvm::Triple::IOS; image_infos[i].os_env = llvm::Triple::MacABI; + } else if (os_name == "iossimulator") { + image_infos[i].os_type = llvm::Triple::IOS; + image_infos[i].os_env = llvm::Triple::Simulator; + } else if (os_name == "tvossimulator") { + image_infos[i].os_type = llvm::Triple::TvOS; + image_infos[i].os_env = llvm::Triple::Simulator; + } else if (os_name == "watchossimulator") { + image_infos[i].os_type = llvm::Triple::WatchOS; + image_infos[i].os_env = llvm::Triple::Simulator; } } if (image->HasKey("min_version_os_sdk")) { diff --git a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py index 5ea55c3f6443..86b54dd3e8e5 100644 --- a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py +++ b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py @@ -82,7 +82,7 @@ def check_simulator_ostype(self, sdk, platform, arch='x86_64'): self.assertIsNotNone(process_info) # Check that ostype is correct - self.assertEquals(process_info['ostype'], platform) + self.assertEquals(process_info['ostype'], platform + 'simulator') # Now for dylibs dylib_info_raw = context.get("dylib_info_raw") @@ -97,7 +97,7 @@ def check_simulator_ostype(self, sdk, platform, arch='x86_64'): break self.assertIsNotNone(image_info) - self.assertEquals(image['min_version_os_name'], platform) + self.assertEquals(image['min_version_os_name'], platform + 'simulator') @apple_simulator_test('iphone') _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits