Merge pull request #727 from MikeMcQuaid/incoming-cask
Prepare for Homebrew Cask to be imported.
This commit is contained in:
commit
54e37e5dcc
@ -15,6 +15,7 @@ module Homebrew
|
|||||||
]
|
]
|
||||||
Dir.glob(scan_files).each do |rb|
|
Dir.glob(scan_files).each do |rb|
|
||||||
next if rb.include?("/vendor/")
|
next if rb.include?("/vendor/")
|
||||||
|
next if rb.include?("/cask/")
|
||||||
ruby_files << rb
|
ruby_files << rb
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -671,6 +671,11 @@ module Homebrew
|
|||||||
test "brew", "tests", "--generic", *tests_args
|
test "brew", "tests", "--generic", *tests_args
|
||||||
test "brew", "tests", "--no-compat", *tests_args_no_compat
|
test "brew", "tests", "--no-compat", *tests_args_no_compat
|
||||||
test "brew", "readall", "--syntax"
|
test "brew", "readall", "--syntax"
|
||||||
|
if OS.mac? &&
|
||||||
|
(HOMEBREW_REPOSITORY/"Library/Homebrew/cask/cmd/brew-cask-tests.rb").exist?
|
||||||
|
test "brew", "cask-tests"
|
||||||
|
end
|
||||||
|
|
||||||
# TODO: try to fix this on Linux at some stage.
|
# TODO: try to fix this on Linux at some stage.
|
||||||
if OS.mac?
|
if OS.mac?
|
||||||
# test update from origin/master to current commit.
|
# test update from origin/master to current commit.
|
||||||
|
@ -12,6 +12,7 @@ SimpleCov.start do
|
|||||||
# tests to be dropped. This causes random fluctuations in test coverage.
|
# tests to be dropped. This causes random fluctuations in test coverage.
|
||||||
merge_timeout 86400
|
merge_timeout 86400
|
||||||
|
|
||||||
|
add_filter "/Homebrew/cask/"
|
||||||
add_filter "/Homebrew/compat/"
|
add_filter "/Homebrew/compat/"
|
||||||
add_filter "/Homebrew/test/"
|
add_filter "/Homebrew/test/"
|
||||||
add_filter "/Homebrew/vendor/"
|
add_filter "/Homebrew/vendor/"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user