Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Travis configuration to use latest Xcode #216

Merged
merged 1 commit into from
Aug 3, 2015
Merged

Update Travis configuration to use latest Xcode #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: objective-c
language: objective-c
osx_image: xcode6.4
before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script: make
- gem install xcpretty -N --quiet
script: make ci
17 changes: 12 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

BUILD_DIR = OBJROOT="$(CURDIR)/build" SYMROOT="$(CURDIR)/build"
SHELL = /bin/bash -e -o pipefail
IPHONE = -scheme OCMockLib -sdk iphonesimulator -destination 'name=iPhone 4S' $(BUILD_DIR)
IOS32 = -scheme OCMockLib -sdk iphonesimulator -destination 'name=iPhone 5' $(BUILD_DIR)
IOS64 = -scheme OCMockLib -sdk iphonesimulator -destination 'name=iPhone 5s' $(BUILD_DIR)
MACOSX = -scheme OCMock -sdk macosx $(BUILD_DIR)
XCODEBUILD = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj"

Expand All @@ -17,11 +18,17 @@ clean:
$(XCODEBUILD) clean
rm -rf "$(CURDIR)/build"

test: test-iphone test-macosx
test: test-ios test-macosx

test-iphone:
@echo "Running iPhone tests..."
$(XCODEBUILD) $(IPHONE) test | xcpretty -c
test-ios: test-ios32 test-ios64

test-ios32:
@echo "Running 32-bit iOS tests..."
$(XCODEBUILD) $(IOS32) test | xcpretty -c

test-ios64:
@echo "Running 64-bit iOS tests..."
$(XCODEBUILD) $(IOS64) test | xcpretty -c

test-macosx:
@echo "Running OS X tests..."
Expand Down