[Lldb-commits] [lldb] r232951 - Fix ObjCDataFormatterTestCase.test_nsdate_* tests (ver. 2)

[Ilia K]

Author: ki.stfu
Date: Mon Mar 23 09:22:27 2015
New Revision: 232951

URL: http://llvm.org/viewvc/llvm-project?rev=232951&view=rev
Log:
Fix ObjCDataFormatterTestCase.test_nsdate_* tests (ver. 2)

This commit reverts r232946 because it caused an another error with absolute time.


Modified:
    lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/main.m

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py?rev=232951&r1=232950&r2=232951&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py Mon Mar 23 09:22:27 2015
@@ -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

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/main.m
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/main.m?rev=232951&r1=232950&r2=232951&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/main.m (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/main.m Mon Mar 23 09:22:27 2015
@@ -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];