diff options
author | Ilia K <ki.stfu@gmail.com> | 2015-03-23 14:22:27 +0000 |
---|---|---|
committer | Ilia K <ki.stfu@gmail.com> | 2015-03-23 14:22:27 +0000 |
commit | e7d19c38d970b933b6c4d65b9ee721b3ffd34efe (patch) | |
tree | abcc81f0a0f9aa10a8b6c63858508a95a136cbf6 | |
parent | fc90b43cea2c2fefe174fc33981981a185b78434 (diff) | |
download | bcm5719-llvm-e7d19c38d970b933b6c4d65b9ee721b3ffd34efe.tar.gz bcm5719-llvm-e7d19c38d970b933b6c4d65b9ee721b3ffd34efe.zip |
Fix ObjCDataFormatterTestCase.test_nsdate_* tests (ver. 2)
This commit reverts r232946 because it caused an another error with absolute time.
llvm-svn: 232951
-rw-r--r-- | lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py | 2 | ||||
-rw-r--r-- | lldb/test/functionalities/data-formatter/data-formatter-objc/main.m | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py index 82314355c9d..14b3932978b 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py @@ -472,7 +472,7 @@ class ObjCDataFormatterTestCase(TestBase): def nsdate_data_formatter_commands(self): self.expect('frame variable date1 date2', - substrs = ['1985-04','2011-01']) + patterns = ['(1985-04-10|1985-04-11)','(2011-01-01|2010-12-31)']) # this test might fail if we hit the breakpoint late on December 31st of some given year # and midnight comes between hitting the breakpoint and running this line of code diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m b/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m index 42725be3ba6..6eb7e021f70 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m @@ -546,8 +546,8 @@ int main (int argc, const char * argv[]) NSURL *nsurl2 = [NSURL URLWithString:@"page.html" relativeToURL:nsurl]; NSURL *nsurl3 = [NSURL URLWithString:@"?whatever" relativeToURL:nsurl2]; - NSDate *date1 = [NSDate dateWithNaturalLanguageString:@"6pm April 10, 1985 UTC"]; - NSDate *date2 = [NSDate dateWithNaturalLanguageString:@"12am January 1, 2011 UTC"]; + NSDate *date1 = [NSDate dateWithNaturalLanguageString:@"6pm April 10, 1985"]; + NSDate *date2 = [NSDate dateWithNaturalLanguageString:@"12am January 1, 2011"]; NSDate *date3 = [NSDate date]; NSDate *date4 = [NSDate dateWithTimeIntervalSince1970:24*60*60]; |