From bee353109049781e6321977ce6b134e8709d102d Mon Sep 17 00:00:00 2001 From: Lukas Oberhuber Date: Mon, 1 Aug 2022 15:25:34 -0700 Subject: [PATCH] Improve style --- Library/Homebrew/extend/os/mac/extend/ENV/shared.rb | 10 ++-------- Library/Homebrew/extend/os/mac/extend/ENV/std.rb | 10 ++-------- Library/Homebrew/test/cmd/install_spec.rb | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb index 019c3091f7..6ee43c0bb8 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb @@ -4,14 +4,8 @@ module SharedEnvExtension extend T::Sig - def setup_build_environment( - formula: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - testing_formula: false, - debug_symbols: false - ) + def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false, + debug_symbols: false) generic_shared_setup_build_environment( formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, testing_formula: testing_formula, debug_symbols: debug_symbols diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb index 1c255a151e..d17b35c64d 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb @@ -10,14 +10,8 @@ module Stdenv ["#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] end - def setup_build_environment( - formula: nil, - cc: nil, - build_bottle: false, - bottle_arch: nil, - testing_formula: false, - debug_symbols: false - ) + def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false, + debug_symbols: false) generic_setup_build_environment(formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, testing_formula: testing_formula, debug_symbols: debug_symbols) diff --git a/Library/Homebrew/test/cmd/install_spec.rb b/Library/Homebrew/test/cmd/install_spec.rb index 590ee68506..cffebfc524 100644 --- a/Library/Homebrew/test/cmd/install_spec.rb +++ b/Library/Homebrew/test/cmd/install_spec.rb @@ -76,7 +76,7 @@ describe "brew install" do it "installs formulae with debug symbols", :integration_test do setup_test_formula "testball1" - expect { brew "install", "testball1", "--debug-symbols", "-s" } + expect { brew "install", "testball1", "--debug-symbols", "--build-from-source" } .to output(%r{#{HOMEBREW_CELLAR}/testball1/0\.1}o).to_stdout .and not_to_output.to_stderr .and be_a_success