Commit 33b696b5 authored by Adrian Prantl's avatar Adrian Prantl
Browse files

Fix test broken by simulator triple changes.

parent 3b2c4e71

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp

+9 −0
Original line number Diff line number Diff line
@@ -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")) {

lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase): 
        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 @@ class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase): 
            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')