evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1128 from blakewatters/bugfix/restore-travis

Browse source 
Restore execution of tests under Travis
This commit is contained in:
Mattt Thompson 2013-07-17 09:44:55 -07:00
commit 5cd0ef7c42
5 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -1,6 +1,7 @@
language: objective-c language: objective-c
before_install: before_install:
- brew update - brew update
- brew install xctool --HEAD - brew uninstall xctool && brew install https://raw.github.com/fpotter/homebrew/246a1439dab49542d4531ad7e1bac7048151f601/Library/Formula/xctool.rb
- gem install cocoapods -v 0.22.2
- cd Tests && pod install && cd $TRAVIS_BUILD_DIR - cd Tests && pod install && cd $TRAVIS_BUILD_DIR
script: rake test script: rake test

8
Rakefile
View file

@ -5,16 +5,12 @@ namespace :test do
desc "Run the AFNetworking Tests for iOS" desc "Run the AFNetworking Tests for iOS"
task :ios => :prepare do task :ios => :prepare do
$ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' build -sdk iphonesimulator -configuration Release") $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator")
$ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' build-tests -sdk iphonesimulator -configuration Release")
$ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' test -test-sdk iphonesimulator -configuration Release")
end end
desc "Run the AFNetworking Tests for Mac OS X" desc "Run the AFNetworking Tests for Mac OS X"
task :osx => :prepare do task :osx => :prepare do
$osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' build -sdk macosx -configuration Release") $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' -sdk macosx -configuration Release test -test-sdk macosx")
$osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' build-tests -sdk macosx -configuration Release")
$osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' test -test-sdk macosx -sdk macosx -configuration Release")
end end
end end

4
Tests/Podfile.lock
View file

@ -17,8 +17,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFHTTPRequestOperationLogger: 34ba125cb9eeb77a3b67aaaca105720ba3a0798c AFHTTPRequestOperationLogger: 34ba125cb9eeb77a3b67aaaca105720ba3a0798c
AFNetworking: 8f204b1ffb21a4ef0f36c83f1e4f052561626bea AFNetworking: 9ec8aafb9269236a7630bd8d9838ce2ba30fa2a0
Expecta: d46fb1bd78c90a83da0158b9b1e108de106e369f Expecta: d46fb1bd78c90a83da0158b9b1e108de106e369f
OCMock: 79212e5e328378af5cfd6edb5feacfd6c49cd8a3 OCMock: 79212e5e328378af5cfd6edb5feacfd6c49cd8a3
COCOAPODS: 0.20.2 COCOAPODS: 0.22.2

2
Tests/Schemes/OS X Tests.xcscheme
View file

@ -4,7 +4,7 @@
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
buildImplicitDependencies = "NO"> buildImplicitDependencies = "YES">
<BuildActionEntries> <BuildActionEntries>
<BuildActionEntry <BuildActionEntry
buildForTesting = "YES" buildForTesting = "YES"

2
Tests/Schemes/iOS Tests.xcscheme
View file

@ -4,7 +4,7 @@
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
buildImplicitDependencies = "NO"> buildImplicitDependencies = "YES">
<BuildActionEntries> <BuildActionEntries>
<BuildActionEntry <BuildActionEntry
buildForTesting = "YES" buildForTesting = "YES"