teemperor created this revision.
teemperor added a reviewer: mib.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
mib accepted this revision.
mib added a comment.
This revision is now accepted and ready to land.
LGTM!
This test creates its dates with `NSDate dateWithNaturalLanguageString` which
is deprecated and uses the current time zone of the machine to
interpret the input string. This causes that the created NSDate has a different
value depending on the locale of the machine
and we hardcoded the value for California's time zone (PST) but the data
formatter gives out the GMT value as a string.
This just replaces the use with the timezone-independent
dateWithTimeIntervalSince1970 (which we also use in the rest of the test)
to make this pass independently of the time zone of the machine running the
test.
Repository:
rLLDB LLDB
https://reviews.llvm.org/D74038
Files:
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
Index:
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
===================================================================
---
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
+++
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
@@ -501,8 +501,8 @@
NSURL *nsurl2 = [NSURL URLWithString:@"page.html"
relativeToURL:nsurl];
NSURL *nsurl3 = [NSURL URLWithString:@"?whatever"
relativeToURL:nsurl2];
- NSDate *date1 = [NSDate dateWithNaturalLanguageString:@"6pm
April 10, 1985"];
- NSDate *date2 = [NSDate dateWithNaturalLanguageString:@"12am
January 1, 2011"];
+ NSDate *date1 = [NSDate
dateWithTimeIntervalSince1970:133890*60*60]; // 6pm April 10, 1985 GMT
+ NSDate *date2 = [NSDate
dateWithTimeIntervalSince1970:14975*24*60*60]; // 12am January 1, 2011 GMT
NSDate *date3 = [NSDate date];
NSDate *date4 = [NSDate dateWithTimeIntervalSince1970:24*60*60];
NSDate *date5 = [NSDate dateWithTimeIntervalSinceReferenceDate:
floor([[NSDate date] timeIntervalSinceReferenceDate])];
Index:
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py
===================================================================
---
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py
+++
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py
@@ -31,7 +31,7 @@
# check formatters for common Objective-C types
expect_strings = [
'(CFGregorianUnits) cf_greg_units = 1 years, 3 months, 5 days, 12
hours, 5 minutes 7 seconds',
- '(CFGregorianDate) cf_greg_date = @"4/11/1985 2:0:0"',
+ '(CFGregorianDate) cf_greg_date = @"4/10/1985 18:0:0"',
'(CFRange) cf_range = location=4 length=4',
'(NSPoint) ns_point = (x = 4, y = 4)',
'(NSRange) ns_range = location=4, length=4',
Index: lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
+++ lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
@@ -501,8 +501,8 @@
NSURL *nsurl2 = [NSURL URLWithString:@"page.html" relativeToURL:nsurl];
NSURL *nsurl3 = [NSURL URLWithString:@"?whatever" relativeToURL:nsurl2];
- NSDate *date1 = [NSDate dateWithNaturalLanguageString:@"6pm April 10, 1985"];
- NSDate *date2 = [NSDate dateWithNaturalLanguageString:@"12am January 1, 2011"];
+ NSDate *date1 = [NSDate dateWithTimeIntervalSince1970:133890*60*60]; // 6pm April 10, 1985 GMT
+ NSDate *date2 = [NSDate dateWithTimeIntervalSince1970:14975*24*60*60]; // 12am January 1, 2011 GMT
NSDate *date3 = [NSDate date];
NSDate *date4 = [NSDate dateWithTimeIntervalSince1970:24*60*60];
NSDate *date5 = [NSDate dateWithTimeIntervalSinceReferenceDate: floor([[NSDate date] timeIntervalSinceReferenceDate])];
Index: lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py
@@ -31,7 +31,7 @@
# check formatters for common Objective-C types
expect_strings = [
'(CFGregorianUnits) cf_greg_units = 1 years, 3 months, 5 days, 12 hours, 5 minutes 7 seconds',
- '(CFGregorianDate) cf_greg_date = @"4/11/1985 2:0:0"',
+ '(CFGregorianDate) cf_greg_date = @"4/10/1985 18:0:0"',
'(CFRange) cf_range = location=4 length=4',
'(NSPoint) ns_point = (x = 4, y = 4)',
'(NSRange) ns_range = location=4, length=4',
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
