aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Library/Homebrew/cmd/test.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/cmd/test.rb
index cd5c095bc..9e8af5bda 100644
--- a/Library/Homebrew/cmd/test.rb
+++ b/Library/Homebrew/cmd/test.rb
@@ -7,6 +7,12 @@ require 'test/unit/assertions'
module Homebrew extend self
TEST_TIMEOUT_SECONDS = 5*60
+ if Object.const_defined?(:Minitest)
+ FailedAssertion = Minitest::Assertion
+ else
+ FailedAssertion = Test::Unit::AssertionFailedError
+ end
+
def test
raise FormulaUnspecifiedError if ARGV.named.empty?
@@ -32,7 +38,7 @@ module Homebrew extend self
Timeout::timeout TEST_TIMEOUT_SECONDS do
raise if f.test == false
end
- rescue Test::Unit::AssertionFailedError => e
+ rescue FailedAssertion => e
ofail "#{f.name}: failed"
puts e.message
rescue Exception