Skip to content
Snippets Groups Projects
Commit 560bea67 authored by ilovezfs's avatar ilovezfs Committed by GitHub
Browse files

Merge pull request #1301 from ilovezfs/mountain-lion-depend-on-xz

dependency_collector: need xz dep on <= macOS 10.8
parents 717eb972 a53eca8c
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@ class DependencyCollector
end
def xz_dep(tags)
return if MacOS.version >= :lion
return if MacOS.version >= :mavericks
Dependency.new("xz", tags)
end
end
......@@ -15,7 +15,7 @@ class OSMacDependencyCollectorTests < Homebrew::TestCase
end
def test_tar_needs_xz_dependency
MacOS.stubs(:version).returns(MacOS::Version.new("10.7"))
MacOS.stubs(:version).returns(MacOS::Version.new("10.9"))
refute DependencyCollector.tar_needs_xz_dependency?
end
......@@ -41,15 +41,15 @@ class OSMacDependencyCollectorTests < Homebrew::TestCase
assert_nil find_dependency("ant")
end
def test_resource_dep_xz_url_pre_lion
MacOS.stubs(:version).returns(MacOS::Version.new("10.6"))
def test_resource_dep_xz_pre_mavericks
MacOS.stubs(:version).returns(MacOS::Version.new("10.8"))
resource = Resource.new
resource.url("http://example.com/foo.tar.xz")
assert_equal Dependency.new("xz", [:build]), @d.add(resource)
end
def test_resource_dep_xz_lion_or_newer
MacOS.stubs(:version).returns(MacOS::Version.new("10.7"))
def test_resource_dep_xz_mavericks_or_newer
MacOS.stubs(:version).returns(MacOS::Version.new("10.9"))
resource = Resource.new
resource.url("http://example.com/foo.tar.xz")
assert_nil @d.add(resource)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment