From b7355ee99ec63f44a6dc4f7dad9bb5a130bcc0eb Mon Sep 17 00:00:00 2001 From: Dave Lee Date: Sun, 21 Jan 2024 15:34:02 -0800 Subject: [PATCH] [lldb] Skip ObjC timezone tests on macOS >= 14 (NFC) (#78817) Starting with macOS 14, the `NSTimeZone` and `CFTimeZone` types are backed by swift implementations. These tests won't pass on mainline lldb, since it doesn't have Swift support. --- .../TestDataFormatterObjCNSDate.py | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSDate.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSDate.py index a1ffe84ad556..c56b887a3f50 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSDate.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSDate.py @@ -19,6 +19,11 @@ class ObjCDataFormatterNSDate(ObjCDataFormatterTestCase): """Test formatters for NSDate.""" self.appkit_tester_impl(self.nsdate_data_formatter_commands, False) + @skipIf(macos_version=[">=", "14.0"]) + def test_timezone_with_run_command(self): + """Test formatters for NSTimeZone and CFTimeZone.""" + self.appkit_tester_impl(self.timezone_data_formatter_commands, False) + def nsdate_data_formatter_commands(self): self.expect( "frame variable date1 date2", @@ -51,16 +56,6 @@ class ObjCDataFormatterNSDate(ObjCDataFormatterTestCase): self.expect_expr("date_1970_plus_05", result_summary="1970-01-01 00:00:00 UTC") self.expect_expr("date_1970_plus_04", result_summary="1970-01-01 00:00:00 UTC") - self.expect( - "frame variable cupertino home europe", - substrs=['"America/Los_Angeles"', '"Europe/Rome"', '"Europe/Paris"'], - ) - - self.expect( - "frame variable cupertino_ns home_ns europe_ns", - substrs=['"America/Los_Angeles"', '"Europe/Rome"', '"Europe/Paris"'], - ) - self.expect( "frame variable mut_bv", substrs=[ @@ -71,3 +66,14 @@ class ObjCDataFormatterNSDate(ObjCDataFormatterTestCase): self.expect_expr("distant_past", result_summary="0001-01-01 00:00:00 UTC") self.expect_expr("distant_future", result_summary="4001-01-01 00:00:00 UTC") + + def timezone_data_formatter_commands(self): + self.expect( + "frame variable cupertino home europe", + substrs=['"America/Los_Angeles"', '"Europe/Rome"', '"Europe/Paris"'], + ) + + self.expect( + "frame variable cupertino_ns home_ns europe_ns", + substrs=['"America/Los_Angeles"', '"Europe/Rome"', '"Europe/Paris"'], + )