diff options
-rw-r--r-- | Foundation/GTMLoggerTest.m | 14 | ||||
-rw-r--r-- | Foundation/GTMObjC2RuntimeTest.m | 2 | ||||
-rw-r--r-- | Foundation/GTMStackTrace.m | 5 |
3 files changed, 16 insertions, 5 deletions
diff --git a/Foundation/GTMLoggerTest.m b/Foundation/GTMLoggerTest.m index d1602f4..940014f 100644 --- a/Foundation/GTMLoggerTest.m +++ b/Foundation/GTMLoggerTest.m @@ -388,7 +388,7 @@ if ([GTMSystemVersion isSnowLeopardOrGreater]) { // E.g. 2009-10-26 22:26:25.086 otest-i386[53200/0xa0438500] [lvl=1] (no func) test kFormatBasePattern = - @"[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3} ((otest-i386)|(otest-x86_64))\\[[0-9]+/0x[0-9a-f]+\\] \\[lvl=[0-3]\\] \\(no func\\) "; + @"[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3} ((otest-i386)|(otest-x86_64)|(otest-ppc))\\[[0-9]+/0x[0-9a-f]+\\] \\[lvl=[0-3]\\] \\(no func\\) "; } else { // E.g. 2008-01-04 09:16:26.906 otest[5567/0xa07d0f60] [lvl=1] (no func) test kFormatBasePattern = @@ -405,24 +405,28 @@ msg = [self stringFromFormatter:fmtr level:kGTMLoggerLevelDebug format:@"test"]; - STAssertTrue([msg gtm_matchesPattern:[kFormatBasePattern stringByAppendingString:@"test"]], nil); + STAssertTrue([msg gtm_matchesPattern:[kFormatBasePattern stringByAppendingString:@"test"]], + @"msg: %@", msg); msg = [self stringFromFormatter:fmtr level:kGTMLoggerLevelError format:@"test %d", 1]; - STAssertTrue([msg gtm_matchesPattern:[kFormatBasePattern stringByAppendingString:@"test 1"]], nil); + STAssertTrue([msg gtm_matchesPattern:[kFormatBasePattern stringByAppendingString:@"test 1"]], + @"msg: %@", msg); msg = [self stringFromFormatter:fmtr level:kGTMLoggerLevelInfo format:@"test %@", @"hi"]; - STAssertTrue([msg gtm_matchesPattern:[kFormatBasePattern stringByAppendingString:@"test hi"]], nil); + STAssertTrue([msg gtm_matchesPattern:[kFormatBasePattern stringByAppendingString:@"test hi"]], + @"msg: %@", msg); msg = [self stringFromFormatter:fmtr level:kGTMLoggerLevelUnknown format:@"test"]; - STAssertTrue([msg gtm_matchesPattern:[kFormatBasePattern stringByAppendingString:@"test"]], nil); + STAssertTrue([msg gtm_matchesPattern:[kFormatBasePattern stringByAppendingString:@"test"]], + @"msg: %@", msg); } - (void)testNoFilter { diff --git a/Foundation/GTMObjC2RuntimeTest.m b/Foundation/GTMObjC2RuntimeTest.m index aa57388..360f931 100644 --- a/Foundation/GTMObjC2RuntimeTest.m +++ b/Foundation/GTMObjC2RuntimeTest.m @@ -348,9 +348,11 @@ AT_REQUIRED if (![GTMSystemVersion isLeopardOrGreater]) { STAssertNULL(method_setImplementation(nil, nil), nil); } +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 if ([GTMSystemVersion isSnowLeopardOrGreater]) { STAssertNULL(method_setImplementation(nil, newImp), nil); } +#endif [test release]; free(list); diff --git a/Foundation/GTMStackTrace.m b/Foundation/GTMStackTrace.m index 568b5d7..5e832c2 100644 --- a/Foundation/GTMStackTrace.m +++ b/Foundation/GTMStackTrace.m @@ -144,6 +144,11 @@ static NSUInteger GTMGetStackAddressDescriptorsForAddresses(void *pcs[], currDesc->class_name = NULL; } currDesc->filename = info.dli_fname; + if (!currDesc->symbol) { + currDesc->symbol = "???"; + currDesc->is_class_method = NO; + currDesc->class_name = NULL; + } } GTMFreeClassDescriptions(class_descs, class_desc_count); return count; |