diff options
| author | Mike McQuaid | 2016-09-13 08:58:12 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-09-13 08:58:12 +0100 |
| commit | 0316830d4fbd9467a0c0f82867ffcc91b9385cb2 (patch) | |
| tree | a708089d745119c1e664acb7d1e02c1e6fd530ff /Library/Homebrew/dev-cmd/test-bot.rb | |
| parent | 4295936322d9dd029e41fcc45438910b27feddc7 (diff) | |
| download | brew-0316830d4fbd9467a0c0f82867ffcc91b9385cb2.tar.bz2 | |
test-bot: also build testing bottle.
Diffstat (limited to 'Library/Homebrew/dev-cmd/test-bot.rb')
| -rw-r--r-- | Library/Homebrew/dev-cmd/test-bot.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index 99b4279ba..2704aa670 100644 --- a/Library/Homebrew/dev-cmd/test-bot.rb +++ b/Library/Homebrew/dev-cmd/test-bot.rb @@ -633,6 +633,7 @@ module Homebrew bottle_args = ["--verbose", "--json", formula_name] bottle_args << "--keep-old" if ARGV.include? "--keep-old" bottle_args << "--skip-relocation" if ARGV.include? "--skip-relocation" + bottle_args << "--force-core-tap" if @test_default_formula test "brew", "bottle", *bottle_args bottle_step = steps.last if bottle_step.passed? && bottle_step.output? @@ -1019,11 +1020,6 @@ module Homebrew ARGV << "--fast" end - # TODO: refactor bottle code so this isn't needed. - if ARGV.include? "--test-default-formula" - ARGV << "--no-bottle" - end - if ARGV.include? "--local" ENV["HOMEBREW_CACHE"] = "#{ENV["HOME"]}/Library/Caches/Homebrew" mkdir_p ENV["HOMEBREW_CACHE"] @@ -1053,6 +1049,8 @@ module Homebrew if ARGV.named.empty? current_test = if ARGV.include?("--test-default-formula") # Build the default test formula. + HOMEBREW_CACHE_FORMULA.mkpath + FileUtils.cp "#{HOMEBREW_LIBRARY}/Homebrew/test/testbottest.rb", HOMEBREW_CACHE_FORMULA Test.new("#{HOMEBREW_LIBRARY}/Homebrew/test/testbottest.rb", :test_default_formula => true, :skip_homebrew => skip_homebrew) else |