aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorBob W. Hogg2016-05-03 07:27:25 -0400
committerBob W. Hogg2016-09-22 08:31:50 -0400
commit54a086e2fe06218c8a336fb7033da60078db7d78 (patch)
tree43126718eae6c3c2e5046a3788399a0a5b0e6f55 /Library
parentbbed7246bc5c5b7acb8c1d427d10b43e090dfd39 (diff)
downloadbrew-54a086e2fe06218c8a336fb7033da60078db7d78.tar.bz2
dependency_collector: Fix ant_dep for Linux.
Signed-off-by: Bob W. Hogg <rwhogg@linux.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/dependency_collector.rb2
-rw-r--r--Library/Homebrew/test/test_dependency_collector.rb14
2 files changed, 15 insertions, 1 deletions
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 08b5fc12b..ed9fc3a85 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -136,7 +136,7 @@ class DependencyCollector
end
def ant_dep(spec, tags)
- if MacOS.version >= :mavericks
+ if MacOS.version >= :mavericks || !OS.mac?
Dependency.new(spec.to_s, tags)
end
end
diff --git a/Library/Homebrew/test/test_dependency_collector.rb b/Library/Homebrew/test/test_dependency_collector.rb
index a94b4959e..305777509 100644
--- a/Library/Homebrew/test/test_dependency_collector.rb
+++ b/Library/Homebrew/test/test_dependency_collector.rb
@@ -76,6 +76,20 @@ class DependencyCollectorTests < Homebrew::TestCase
assert_predicate dep, :optional?
end
+ def test_ant_dep_mavericks_or_newer
+ skip "Only for Mac OS" unless OS.mac?
+ MacOS.stubs(:version).returns(MacOS::Version.new("10.9"))
+ @d.add :ant => :build
+ assert_equal find_dependency("ant"), Dependency.new("ant", [:build])
+ end
+
+ def test_ant_dep_pre_mavericks
+ skip "Only for Mac OS" unless OS.mac?
+ MacOS.stubs(:version).returns(MacOS::Version.new("10.7"))
+ @d.add :ant => :build
+ assert_nil find_dependency("ant")
+ end
+
def test_raises_typeerror_for_unknown_classes
assert_raises(TypeError) { @d.add(Class.new) }
end