archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 39201,39202:

Browse source 
* win32/Makefile.sub (config.status): site and vendor directories
	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]

	* configure.in (rubysitearchprefix): sitearchdir and vendorarchdir
	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-19 03:25:48 +00:00
parent 2e4dfbca26
commit fc23f8c695
5 changed files with 65 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

41
test/test_rbconfig.rb Normal file
View file

@ -0,0 +1,41 @@
require 'test/unit'
require 'rbconfig'
class TestRbConfig < Test::Unit::TestCase
def test_sitedirs
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\Asite(?!arch)/ =~ key
assert_match(/(?:\$\(|\/)site/, val, key)
end
end
def test_vendordirs
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\Avendor(?!arch)/ =~ key
assert_match(/(?:\$\(|\/)vendor/, val, key)
end
end
def test_archdirs
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\A(?!site|vendor|archdir\z).*arch.*dir\z/ =~ key
assert_match(/\$\(arch|\$\(rubyarchprefix\)/, val, key)
end
end
def test_sitearchdirs
bug7823 = '[ruby-dev:46964] [Bug #7823]'
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\Asite.*arch.*dir\z/ =~ key
assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
end
end
def test_vendorarchdirs
bug7823 = '[ruby-dev:46964] [Bug #7823]'
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\Avendor.*arch.*dir\z/ =~ key
assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
end
end
end