Skip to content

Commit

Permalink
Merge pull request #68 from kishikawakatsumi/coverage
Browse files Browse the repository at this point in the history
Use XCJobs instead cpp-coveralls
  • Loading branch information
kishikawakatsumi committed Feb 1, 2015
2 parents ff719f5 + a0a125f commit 6a3b6e8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 45 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
language: objective-c
install:
- sudo easy_install cpp-coveralls
- (cd Lib && bundle install --path=vendor/bundle --binstubs=vendor/bin)
script:
- (cd Lib && bundle exec rake test:ios test:osx)
after_success:
- ./Lib/Script/coveralls.sh
- (cd Lib && bundle exec rake test:ios test:osx coverage:coveralls)
branches:
only:
- master
Expand Down
2 changes: 1 addition & 1 deletion Lib/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
rake (10.4.2)
xcjobs (0.0.5)
xcjobs (0.0.6)
xcpretty (0.1.7)

PLATFORMS
Expand Down
10 changes: 7 additions & 3 deletions Lib/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def destinations
'name=iPhone 5s,OS=7.1',
'name=iPhone 5s,OS=8.1',
'name=iPhone 6,OS=8.1',
'name=iPhone 6 Plus,OS=8.1'
'name=iPhone 6 Plus,OS=8.1',
]
end

Expand Down Expand Up @@ -54,9 +54,8 @@ XCJobs::Test.new('test:ios') do |t|
destinations.each do |destination|
t.add_destination(destination)
end
t.coverage = true
t.formatter = 'xcpretty -c'
t.add_build_setting('GCC_INSTRUMENT_PROGRAM_FLOW_ARCS', 'YES')
t.add_build_setting('GCC_GENERATE_TEST_COVERAGE_FILES', 'YES')
end

XCJobs::Test.new('test:osx') do |t|
Expand All @@ -67,3 +66,8 @@ XCJobs::Test.new('test:osx') do |t|
t.build_dir = 'build'
t.formatter = 'xcpretty -c'
end

XCJobs::Coverage::Coveralls.new() do |t|
t.add_extension('.m')
t.add_exclude('Lib/UICKeyChainStoreTests')
end
19 changes: 0 additions & 19 deletions Lib/Script/create-coveralls-script.sh

This file was deleted.

18 changes: 0 additions & 18 deletions Lib/UICKeyChainStore.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@
14A59CFA1A62F336006561CC /* Sources */,
14A59CFB1A62F336006561CC /* Frameworks */,
14A59CFC1A62F336006561CC /* CopyFiles */,
14A59D171A62F3C5006561CC /* Create Coveralls Script */,
);
buildRules = (
);
Expand Down Expand Up @@ -481,23 +480,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
14A59D171A62F3C5006561CC /* Create Coveralls Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Create Coveralls Script";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "Script/create-coveralls-script.sh";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
14A59C981A62CF6E006561CC /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down

0 comments on commit 6a3b6e8

Please sign in to comment.