From 135ecd1295cdcbb1500ec2216d37f00e485130f8 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 17 Aug 2016 09:09:55 +0100
Subject: [PATCH] Prepare for Homebrew Cask to be imported.
- ignore Cask's files in `readall` (for now, there's an intentional
syntax error that will need fixed)
- run Cask's tests if they exist
- don't check Cask's files in coverage reports (for now)
---
Library/Homebrew/cmd/readall.rb | 1 +
Library/Homebrew/dev-cmd/test-bot.rb | 5 +++++
Library/Homebrew/test/.simplecov | 1 +
3 files changed, 7 insertions(+)
diff --git a/Library/Homebrew/cmd/readall.rb b/Library/Homebrew/cmd/readall.rb
index e399e7c2b5..62cdfa5d4d 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 e3ba7e41ef..d01c70fe67 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 e616230813..3cbd539431 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/"
--
GitLab