From d9a07b9d5401eeed1c20d890c66fb5c273801618 Mon Sep 17 00:00:00 2001 From: Justin DeWind Date: Wed, 13 Jun 2012 11:25:51 -0500 Subject: [PATCH] Updated SDK and configured test targets to run tests after build --- Objection.xcodeproj/project.pbxproj | 4 ++++ Rakefile | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Objection.xcodeproj/project.pbxproj b/Objection.xcodeproj/project.pbxproj index 87e6304..cd53f24 100644 --- a/Objection.xcodeproj/project.pbxproj +++ b/Objection.xcodeproj/project.pbxproj @@ -1470,6 +1470,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -1498,6 +1499,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; }; name = Release; @@ -1530,6 +1532,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -1559,6 +1562,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; }; name = Release; diff --git a/Rakefile b/Rakefile index 96f65f8..0ac8e01 100644 --- a/Rakefile +++ b/Rakefile @@ -2,7 +2,7 @@ PROJECT_NAME = "Objection" CONFIGURATION = "Debug" SPECS_TARGET_NAME = "Specs-OSX" UI_SPECS_TARGET_NAME = "Specs-iOS" -SDK_DIR = "/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk" +SDK_DIR = "iphonesimulator5.1" def xcodebuild_executable ENV['XCODEBUILD'] || "xcodebuild" @@ -76,6 +76,7 @@ namespace :specs do desc "iOS Specs" task :ios do stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "build_uispecs.output") if (ENV['IS_CI_BOX']) + ENV["TEST_AFTER_BUILD"] = "Yes" system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target #{UI_SPECS_TARGET_NAME} -sdk #{SDK_DIR} -configuration #{CONFIGURATION} build], stdout) end end