From a1b0ef1300ff8ac07ef904479b0321a2a5fc0368 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Mon, 4 Jul 2016 18:26:44 +0100
Subject: Remove unnecessary official command tapping.

---
 Library/Homebrew/cmd/tests.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'Library/Homebrew/cmd')

diff --git a/Library/Homebrew/cmd/tests.rb b/Library/Homebrew/cmd/tests.rb
index 2e6bb647b..be8f72ace 100644
--- a/Library/Homebrew/cmd/tests.rb
+++ b/Library/Homebrew/cmd/tests.rb
@@ -7,21 +7,16 @@ require "tap"
 
 module Homebrew
   def tests
-    ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
-
-    if ARGV.include? "--official-cmd-taps"
-      ENV["HOMEBREW_TEST_OFFICIAL_CMD_TAPS"] = "1"
-      OFFICIAL_CMD_TAPS.each do |tap, _|
-        tap = Tap.fetch tap
-        tap.install unless tap.installed?
-      end
-    end
-
     (HOMEBREW_LIBRARY/"Homebrew/test").cd do
+      ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
       ENV["TESTOPTS"] = "-v" if ARGV.verbose?
       ENV["HOMEBREW_NO_COMPAT"] = "1" if ARGV.include? "--no-compat"
       ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if ARGV.include? "--generic"
       ENV["HOMEBREW_NO_GITHUB_API"] = "1" unless ARGV.include? "--online"
+      if ARGV.include? "--official-cmd-taps"
+        ENV["HOMEBREW_TEST_OFFICIAL_CMD_TAPS"] = "1"
+      end
+
       if ARGV.include? "--coverage"
         ENV["HOMEBREW_TESTS_COVERAGE"] = "1"
         FileUtils.rm_f "coverage/.resultset.json"
-- 
cgit v1.2.3