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

Merge pull request #6917 from GauthamGoli/test-args-fix

Browse Source 
Reuse `test_args` and `postinstall_args` methods
This commit is contained in:
Mike McQuaid 2020-01-13 15:14:36 +00:00 committed by GitHub
commit d837734a89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/postinstall.rb
View File

@ -7,17 +7,10 @@ require "debrew"
require "fcntl" require "fcntl"
require "socket" require "socket"
require "cli/parser" require "cli/parser"
require "cmd/postinstall"
def postinstall_args
Homebrew::CLI::Parser.new do
switch :force
switch :verbose
switch :debug
end
end
begin begin
postinstall_args.parse Homebrew.postinstall_args.parse
error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io) error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io)
error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)

11
Library/Homebrew/test.rb
View File

@ -10,19 +10,12 @@ require "formula_assertions"
require "fcntl" require "fcntl"
require "socket" require "socket"
require "cli/parser" require "cli/parser"
require "dev-cmd/test"
def test_args
Homebrew::CLI::Parser.new do
switch :force
switch :verbose
switch :debug
end
end
TEST_TIMEOUT_SECONDS = 5 * 60 TEST_TIMEOUT_SECONDS = 5 * 60
begin begin
test_args.parse Homebrew.test_args.parse
error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io) error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io)
error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)