Merge branch 'deprecate-ignore_missing_libraries' into deprecate-disable-remove

This commit is contained in:
Mike McQuaid 2023-02-03 10:49:54 +00:00
commit 3c7adc91ac
No known key found for this signature in database
GPG Key ID: 3338A31AFDB1D829
3 changed files with 1 additions and 49 deletions

View File

@ -3437,6 +3437,7 @@ class Formula
# Permit links to certain libraries that don't exist. Available on Linux only. # Permit links to certain libraries that don't exist. Available on Linux only.
def ignore_missing_libraries(*libs) def ignore_missing_libraries(*libs)
odeprecated "ignore_missing_libraries"
unless Homebrew::SimulateSystem.simulating_or_running_on_linux? unless Homebrew::SimulateSystem.simulating_or_running_on_linux?
raise FormulaSpecificationError, "#{__method__} is available on Linux only" raise FormulaSpecificationError, "#{__method__} is available on Linux only"
end end

View File

@ -131,7 +131,6 @@ module RuboCop
fails_with fails_with
resource resource
patch patch
ignore_missing_libraries
] ]
on_system_allowed_methods += on_system_methods.map(&:to_s) on_system_allowed_methods += on_system_methods.map(&:to_s)
_, offensive_node = check_order(component_precedence_list, on_system_block.body) _, offensive_node = check_order(component_precedence_list, on_system_block.body)

View File

@ -1845,54 +1845,6 @@ describe Formula do
end end
end end
describe "#ignore_missing_libraries" do
after do
Homebrew::SimulateSystem.clear
end
it "adds library to allowed_missing_libraries on Linux", :needs_linux do
Homebrew::SimulateSystem.clear
f = formula do
url "foo-1.0"
ignore_missing_libraries "bar.so"
end
expect(f.class.allowed_missing_libraries.to_a).to eq(["bar.so"])
end
it "adds library to allowed_missing_libraries on macOS when simulating Linux", :needs_macos do
Homebrew::SimulateSystem.os = :linux
f = formula do
url "foo-1.0"
ignore_missing_libraries "bar.so"
end
expect(f.class.allowed_missing_libraries.to_a).to eq(["bar.so"])
end
it "raises an error on macOS", :needs_macos do
Homebrew::SimulateSystem.clear
expect {
formula do
url "foo-1.0"
ignore_missing_libraries "bar.so"
end
}.to raise_error("ignore_missing_libraries is available on Linux only")
end
it "raises an error on Linux when simulating macOS", :needs_linux do
Homebrew::SimulateSystem.os = :macos
expect {
formula do
url "foo-1.0"
ignore_missing_libraries "bar.so"
end
}.to raise_error("ignore_missing_libraries is available on Linux only")
end
end
describe "#generate_completions_from_executable" do describe "#generate_completions_from_executable" do
let(:f) do let(:f) do
Class.new(Testball) do Class.new(Testball) do