Merge pull request #727 from MikeMcQuaid/incoming-cask

Prepare for Homebrew Cask to be imported.

3 files changed, 7 insertions, 0 deletions

diff --git a/Library/Homebrew/cmd/readall.rb b/Library/Homebrew/cmd/readall.rb
index e399e7c2b..62cdfa5d4 100644
--- a/Library/Homebrew/cmd/readall.rb
+++ b/Library/Homebrew/cmd/readall.rb
@@ -15,6 +15,7 @@ module Homebrew
       ]
       Dir.glob(scan_files).each do |rb|
         next if rb.include?("/vendor/")
+        next if rb.include?("/cask/")
         ruby_files << rb
       end
 
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index e3ba7e41e..d01c70fe6 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -671,6 +671,11 @@ module Homebrew
         test "brew", "tests", "--generic", *tests_args
         test "brew", "tests", "--no-compat", *tests_args_no_compat
         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.
         if OS.mac?
           # test update from origin/master to current commit.
diff --git a/Library/Homebrew/test/.simplecov b/Library/Homebrew/test/.simplecov
index e61623081..3cbd53943 100644
--- a/Library/Homebrew/test/.simplecov
+++ b/Library/Homebrew/test/.simplecov
@@ -12,6 +12,7 @@ SimpleCov.start do
   # tests to be dropped. This causes random fluctuations in test coverage.
   merge_timeout 86400
 
+  add_filter "/Homebrew/cask/"
   add_filter "/Homebrew/compat/"
   add_filter "/Homebrew/test/"
   add_filter "/Homebrew/vendor/"