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

Define RUBY_PATH for tests

Browse Source
This commit is contained in:
Jack Nagel 2013-04-07 18:40:17 -05:00
parent 34bcb10b54
commit 9013b3a0c9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/global.rb
View File

@ -63,9 +63,8 @@ end
HOMEBREW_LOGS = Pathname.new('~/Library/Logs/Homebrew/').expand_path HOMEBREW_LOGS = Pathname.new('~/Library/Logs/Homebrew/').expand_path
RUBY_CONFIG = RbConfig::CONFIG RUBY_BIN = Pathname.new("#{RbConfig::CONFIG['bindir']}")
RUBY_BIN = Pathname.new("#{RUBY_CONFIG['bindir']}") RUBY_PATH = RUBY_BIN + RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']
RUBY_PATH = RUBY_BIN/RUBY_CONFIG['ruby_install_name'] + RUBY_CONFIG['EXEEXT']
if RUBY_PLATFORM =~ /darwin/ if RUBY_PLATFORM =~ /darwin/
MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp

4
Library/Homebrew/test/testing_env.rb
View File

@ -12,6 +12,7 @@ require 'extend/pathname'
require 'extend/string' require 'extend/string'
require 'exceptions' require 'exceptions'
require 'utils' require 'utils'
require 'rbconfig'
# Constants normally defined in global.rb # Constants normally defined in global.rb
HOMEBREW_PREFIX = Pathname.new('/private/tmp/testbrew/prefix') HOMEBREW_PREFIX = Pathname.new('/private/tmp/testbrew/prefix')
@ -26,6 +27,9 @@ HOMEBREW_WWW = 'http://example.com'
HOMEBREW_CURL_ARGS = '-fsLA' HOMEBREW_CURL_ARGS = '-fsLA'
HOMEBREW_VERSION = '0.9-test' HOMEBREW_VERSION = '0.9-test'
RUBY_BIN = Pathname.new("#{RbConfig::CONFIG['bindir']}")
RUBY_PATH = RUBY_BIN + RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']
MACOS = true MACOS = true
MACOS_VERSION = ENV.fetch('MACOS_VERSION', 10.6) MACOS_VERSION = ENV.fetch('MACOS_VERSION', 10.6)
MACOS_FULL_VERSION = '10.6.8' MACOS_FULL_VERSION = '10.6.8'