From 39ce9c890e3c1cda60b370ff8ac49cd640be90e1 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Thu, 26 Jan 2017 23:11:37 +0100
Subject: [PATCH] Try uploading coverage report in `.simplecov`.

---
 Library/Homebrew/.simplecov                  |  6 ++++++
 Library/Homebrew/cask/cmd/brew-cask-tests.rb | 11 -----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Library/Homebrew/.simplecov b/Library/Homebrew/.simplecov
index 952bb466b5..9db7b3210f 100755
--- a/Library/Homebrew/.simplecov
+++ b/Library/Homebrew/.simplecov
@@ -52,3 +52,9 @@ SimpleCov.start do
     /Homebrew/test.rb
   ]
 end
+
+if ENV["CODECOV_TOKEN"] || ENV["TRAVIS"]
+  require "codecov"
+  formatter = SimpleCov::Formatter::Codecov.new
+  formatter.format(SimpleCov::ResultMerger.merged_result)
+end
diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
index 49650c5193..2bff513fe9 100755
--- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb
+++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
@@ -1,5 +1,4 @@
 require "English"
-require "bundler/setup"
 
 ENV["BUNDLE_GEMFILE"] = "#{HOMEBREW_LIBRARY_PATH}/cask/Gemfile"
 ENV["BUNDLE_PATH"] = "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle"
@@ -25,10 +24,8 @@ repo_root.cd do
   rspec = ARGV.flag?("--rspec") || !ARGV.flag?("--minitest")
   minitest = ARGV.flag?("--minitest") || !ARGV.flag?("--rspec")
 
-  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
@@ -50,12 +47,4 @@ repo_root.cd do
   end
 
   Homebrew.failed = failed
-
-  if upload_coverage
-    puts "Submitting Codecov coverage..."
-    require "simplecov"
-    require "codecov"
-    formatter = SimpleCov::Formatter::Codecov.new
-    formatter.format(SimpleCov::ResultMerger.merged_result)
-  end
 end