Merge pull request #1612 from MikeMcQuaid/travis-xcode-8.1

travis: use Xcode 8.1 on Sierra.

1 files changed, 7 insertions, 2 deletions

diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
index 0bfc4b037..43683a263 100755
--- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb
+++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
@@ -24,7 +24,11 @@ repo_root.cd do
   rspec = ARGV.flag?("--rspec") || !ARGV.flag?("--minitest")
   minitest = ARGV.flag?("--minitest") || !ARGV.flag?("--rspec")
 
-  ENV["HOMEBREW_TESTS_COVERAGE"] = "1" if ARGV.flag?("--coverage")
+  p [:coverage, ARGV.flag?("--coverage"), ENV["CI"], ENV["TRAVIS"]]
+  if ARGV.flag?("--coverage")
+    ENV["HOMEBREW_TESTS_COVERAGE"] = "1"
+    upload_coverage = ENV["CODECOV_TOKEN"] || ENV["TRAVIS"]
+  end
 
   failed = false
 
@@ -46,7 +50,8 @@ repo_root.cd do
 
   Homebrew.failed = failed
 
-  if ENV["CODECOV_TOKEN"]
+  if upload_coverage
+    puts "Submitting Codecov coverage..."
     system "bundle", "exec", "rake", "test:coverage:upload"
   end
 end