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

test/subversion: fix subversion paths/detection.

Browse Source
This commit is contained in:
Mike McQuaid 2019-11-06 14:58:33 +00:00
parent 924af100b7
commit 6a33959888
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/test/spec_helper.rb
View File

@ -124,8 +124,19 @@ RSpec.configure do |config|
end end
config.before(:each, :needs_svn) do config.before(:each, :needs_svn) do
homebrew_bin = File.dirname HOMEBREW_BREW_FILE svn_paths = PATH.new(ENV["PATH"])
skip "subversion not installed." unless %W[/usr/bin/svn #{homebrew_bin}/svn].map { |x| File.executable?(x) }.any? if OS.mac?
xcrun_svn = Utils.popen_read("xcrun", "-f", "svn")
svn_paths.append(File.dirname(xcrun_svn)) if $CHILD_STATUS.success? && xcrun_svn.present?
end
svn = which("svn", svn_paths)
svnadmin = which("svnadmin", svn_paths)
skip "subversion not installed." if !svn || !svnadmin
ENV["PATH"] = PATH.new(ENV["PATH"])
.append(svn.dirname)
.append(svnadmin.dirname)
end end
config.before(:each, :needs_unzip) do config.before(:each, :needs_unzip) do

4
Library/Homebrew/test/unpack_strategy/subversion_spec.rb
View File

@ -8,9 +8,7 @@ describe UnpackStrategy::Subversion, :needs_svn do
let(:path) { working_copy } let(:path) { working_copy }
before do before do
svnadmin = ["svnadmin"] safe_system "svnadmin", "create", repo
svnadmin = ["xcrun", *svnadmin] if OS.mac? && MacOS.version >= :catalina
safe_system(*svnadmin, "create", repo)
safe_system "svn", "checkout", "file://#{repo}", working_copy safe_system "svn", "checkout", "file://#{repo}", working_copy
FileUtils.touch working_copy/"test" FileUtils.touch working_copy/"test"