admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

dependency_collector: Fix ant_dep for Linux.

Browse Source 
Signed-off-by: Bob W. Hogg <rwhogg@linux.com>
This commit is contained in:
Bob W. Hogg 2016-05-03 07:27:25 -04:00
parent bbed7246bc
commit 54a086e2fe
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dependency_collector.rb
View File

@ -136,7 +136,7 @@ class DependencyCollector
end end
def ant_dep(spec, tags) def ant_dep(spec, tags)
if MacOS.version >= :mavericks if MacOS.version >= :mavericks || !OS.mac?
Dependency.new(spec.to_s, tags) Dependency.new(spec.to_s, tags)
end end
end end

14
Library/Homebrew/test/test_dependency_collector.rb
View File

@ -76,6 +76,20 @@ class DependencyCollectorTests < Homebrew::TestCase
assert_predicate dep, :optional? assert_predicate dep, :optional?
end 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 def test_raises_typeerror_for_unknown_classes
assert_raises(TypeError) { @d.add(Class.new) } assert_raises(TypeError) { @d.add(Class.new) }
end end