diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2014-08-01 20:30:07 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2014-08-01 20:30:07 +0000 |
| commit | 24483183e727acc8daf490ea9f288ee7546991a6 (patch) | |
| tree | 818092d8ed6130d03c7ca29262c47d0ce79c843c /UnitTesting | |
| parent | 0f81b5483f17785f06a8ad4c4d56de227f983f87 (diff) | |
General fixes for GTM.
a) only define GTM_IPHONE_USE_SENTEST if it hasn't been defined on Mac. It's a horrible name, but
it does control us using SENTEST instead of XCTest.
b) Object is now found in the runtime on both iOS and MacOS
c) MethodCheck had a potential memory leak
DELTA=47 (18 added, 5 deleted, 24 changed)
DELTA_BY_EXTENSION=h=30,m=12
Diffstat (limited to 'UnitTesting')
| -rw-r--r-- | UnitTesting/GTMSenTestCase.h | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/UnitTesting/GTMSenTestCase.h b/UnitTesting/GTMSenTestCase.h index a5fa2ed..e3a7a33 100644 --- a/UnitTesting/GTMSenTestCase.h +++ b/UnitTesting/GTMSenTestCase.h @@ -53,31 +53,38 @@ #import "GTMDefines.h" -// XCTest didn't exist before Xcode 5. Xcode 5 uses clang 5. -#if (__clang_major__ < 5) || GTM_IPHONE_USE_SENTEST -#import <SenTestingKit/SenTestingKit.h> -#elif GTM_USING_XCTEST -#import <XCTest/XCTest.h> -#else -#import <Foundation/Foundation.h> -#ifdef __cplusplus -extern "C" { -#endif - -#if defined __clang__ -// gcc and gcc-llvm do not allow you to use STAssert(blah, nil) with nil -// as a description if you have the NS_FORMAT_FUNCTION on. -// clang however will not compile without warnings if you don't have it. -NSString *STComposeString(NSString *, ...) NS_FORMAT_FUNCTION(1, 2); -#else -NSString *STComposeString(NSString *, ...); -#endif // __clang__ - -#ifdef __cplusplus -} -#endif - -#endif +#if GTM_MACOS_SDK + #if GTM_USING_XCTEST + #import <XCTest/XCTest.h> + #else + #import <SenTestingKit/SenTestingKit.h> + #endif // GTM_USING_XCTEST + // We don't support our built in testing on MacOS since its always had sentest. +#elif GTM_IPHONE_SDK + #if GTM_IPHONE_USE_SENTEST + #import <SenTestingKit/SenTestingKit.h> + #elif GTM_USING_XCTEST + #import <XCTest/XCTest.h> + #else + #import <Foundation/Foundation.h> + #ifdef __cplusplus + extern "C" { + #endif + + #if defined __clang__ + // gcc and gcc-llvm do not allow you to use STAssert(blah, nil) with nil + // as a description if you have the NS_FORMAT_FUNCTION on. + // clang however will not compile without warnings if you don't have it. + NSString *STComposeString(NSString *, ...) NS_FORMAT_FUNCTION(1, 2); + #else + NSString *STComposeString(NSString *, ...); + #endif // __clang__ + + #ifdef __cplusplus + } + #endif + #endif // GTM_IPHONE_USE_SENTEST +#endif // GTM_MACOS_SDK #if GTM_USING_XCTEST |