Author: Augusto Noronha Date: 2021-09-16T17:49:59-03:00 New Revision: 8fb86011026c56204e54a2806d598249c6297d08
URL: https://github.com/llvm/llvm-project/commit/8fb86011026c56204e54a2806d598249c6297d08 DIFF: https://github.com/llvm/llvm-project/commit/8fb86011026c56204e54a2806d598249c6297d08.diff LOG: Revert "[lldb] Skip TestAppleSimulatorOSType if json parsing fails" This reverts commit 47dd1f642846d476e3d789f4aa941699dc0ed3fe. After discussing with Jim Ingham, we agreed to leave the test as-is so we can catch any CI problems instead of silently skipping the test. Added: Modified: lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py Removed: ################################################################################ diff --git a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py index 1230af95a9a33..01942344e0e10 100644 --- a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py +++ b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py @@ -20,16 +20,7 @@ def check_simulator_ostype(self, sdk, platform_name, arch=platform.machine()): cmd = ['xcrun', 'simctl', 'list', '-j', 'devices'] self.trace(' '.join(cmd)) sim_devices_str = subprocess.check_output(cmd).decode("utf-8") - - # xcodebuild, which is invoked by the apple_simulator_test decorator, - # may return a successful status even if it was unable to run due to - # the authorization agent denying it. Try to parse the json that lists - # the simulators but if that fails skip the test. - try: - sim_devices = json.loads(sim_devices_str)['devices'] - except json.decoder.JSONDecodeError: - self.skipTest("Could not parse JSON of simulators available") - + sim_devices = json.loads(sim_devices_str)['devices'] # Find an available simulator for the requested platform deviceUDID = None deviceRuntime = None _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
