Permalink
Browse files

Merge branches 'xcode-fixes' and 'custom-test-case-subclass'

  • Loading branch information...
3 parents 948bfa1 + 234e9b5 + a951785 commit c19d960d3c84893e0d60ef3adf61917fbd75aa65 @jspahrsummers jspahrsummers committed Aug 8, 2012
Showing with 17 additions and 9 deletions.
  1. +11 −7 Specta.xcodeproj/project.pbxproj
  2. +5 −1 src/SpectaSupport.h
  3. +1 −1 test/UnexpectedExceptionTest.m
@@ -536,7 +536,7 @@
E9D96A1D14B6B8AA007D9521 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = "Peter Jihoon Kim";
};
buildConfigurationList = E9D96A2014B6B8AA007D9521 /* Build configuration list for PBXProject "Specta" */;
@@ -728,7 +728,7 @@
GCC_ENABLE_OBJC_GC = unsupported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Specta-Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -772,7 +772,7 @@
GCC_ENABLE_OBJC_GC = unsupported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Specta-Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "test/support/Test-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = (
@@ -801,7 +801,7 @@
GCC_ENABLE_OBJC_GC = unsupported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Specta-Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "test/support/Test-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = (
@@ -871,13 +871,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Specta-Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = "";
@@ -888,6 +889,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
@@ -906,11 +908,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
GCC_ENABLE_OBJC_GC = supported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Specta-Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "test/support/Test-Info.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -930,11 +933,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
GCC_ENABLE_OBJC_GC = supported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Specta-Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "test/support/Test-Info.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
View
@@ -1,5 +1,9 @@
+#ifndef SPT_SUBCLASS
+#define SPT_SUBCLASS SPTSenTestCase
+#endif
+
#define _SPT_SpecBegin(name, file, line) \
-@interface name##Spec : SPTSenTestCase \
+@interface name##Spec : SPT_SUBCLASS \
@end \
@implementation name##Spec \
- (void)SPT_defineSpec { \
@@ -35,7 +35,7 @@ - (void)testUnexpectedExceptionHandling {
if([NSException instancesRespondToSelector:@selector(callStackSymbols)]) {
expect(reason).toContain(@"Call Stack:");
expect(reason).toContain(@"raiseException");
- expect(reason).toContain(@"_UnexpectedExceptionTestSpec");
+ expect(reason).toContain(@"UnexpectedExceptionTest");
}
expect([exception filename]).toContain(@"UnexpectedExceptionTest.m");
shouldRaiseException = NO;

0 comments on commit c19d960

Please sign in to comment.