From 5b638901987655ddeb0a3a860cfbe50c67112516 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Mon, 7 Mar 2016 18:18:36 +0800 Subject: [PATCH] test-bot: check if current repo is a tap If it's not a tap, we test formula on CoreTap. This can happen if we run test on a fork, e.g. Linuxbrew or future Homebrew/brew. Closes Homebrew/homebrew#49844. Signed-off-by: Xu Cheng --- Library/Homebrew/cmd/test-bot.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index b6fc301bdf..71a0257ab4 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -34,13 +34,14 @@ require "tap" module Homebrew BYTES_IN_1_MEGABYTE = 1024*1024 + HOMEBREW_TAP_REGEX = %r{^([\w-]+)/homebrew-([\w-]+)$} def resolve_test_tap if tap = ARGV.value("tap") return Tap.fetch(tap) end - if tap = ENV["TRAVIS_REPO_SLUG"] + if (tap = ENV["TRAVIS_REPO_SLUG"]) && (tap =~ HOMEBREW_TAP_REGEX) return Tap.fetch(tap) end @@ -48,7 +49,7 @@ module Homebrew bot_argv = ENV["UPSTREAM_BOT_PARAMS"].split " " bot_argv.extend HomebrewArgvExtension if tap = bot_argv.value("tap") - return Tap.fetch(tap) + return Tap.fetch(tap) if url_path =~ HOMEBREW_TAP_REGEX end end