mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
test_rbconfig.rb: honor configuration options
* test/test_rbconfig.rb (TestRbConfig): skip user defined values by configuration options. [Bug #7902] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b9ef804fb8
commit
20fa732495
2 changed files with 17 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Fri Feb 22 11:36:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* test/test_rbconfig.rb (TestRbConfig): skip user defined values by
|
||||||
|
configuration options. [Bug #7902]
|
||||||
|
|
||||||
Fri Feb 22 11:33:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri Feb 22 11:33:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path
|
* lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path
|
||||||
|
|
|
@ -1,10 +1,18 @@
|
||||||
require 'test/unit'
|
require 'test/unit'
|
||||||
require 'rbconfig'
|
require 'rbconfig'
|
||||||
|
require 'shellwords'
|
||||||
|
|
||||||
class TestRbConfig < Test::Unit::TestCase
|
class TestRbConfig < Test::Unit::TestCase
|
||||||
|
@@with_config = {}
|
||||||
|
|
||||||
|
Shellwords::shellwords(CONFIG["configure_args"]).grep(/\A--with-([^=]*)=(.*)/) do
|
||||||
|
@@with_config[$1.tr('_', '-')] = $2
|
||||||
|
end
|
||||||
|
|
||||||
def test_sitedirs
|
def test_sitedirs
|
||||||
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
||||||
next unless /\Asite(?!arch)/ =~ key
|
next unless /\Asite(?!arch)/ =~ key
|
||||||
|
next if @@with_config[key]
|
||||||
assert_match(/(?:\$\(|\/)site/, val, key)
|
assert_match(/(?:\$\(|\/)site/, val, key)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -12,6 +20,7 @@ class TestRbConfig < Test::Unit::TestCase
|
||||||
def test_vendordirs
|
def test_vendordirs
|
||||||
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
||||||
next unless /\Avendor(?!arch)/ =~ key
|
next unless /\Avendor(?!arch)/ =~ key
|
||||||
|
next if @@with_config[key]
|
||||||
assert_match(/(?:\$\(|\/)vendor/, val, key)
|
assert_match(/(?:\$\(|\/)vendor/, val, key)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -19,6 +28,7 @@ class TestRbConfig < Test::Unit::TestCase
|
||||||
def test_archdirs
|
def test_archdirs
|
||||||
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
||||||
next unless /\A(?!site|vendor|archdir\z).*arch.*dir\z/ =~ key
|
next unless /\A(?!site|vendor|archdir\z).*arch.*dir\z/ =~ key
|
||||||
|
next if @@with_config[key]
|
||||||
assert_match(/\$\(arch|\$\(rubyarchprefix\)/, val, key)
|
assert_match(/\$\(arch|\$\(rubyarchprefix\)/, val, key)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -27,6 +37,7 @@ class TestRbConfig < Test::Unit::TestCase
|
||||||
bug7823 = '[ruby-dev:46964] [Bug #7823]'
|
bug7823 = '[ruby-dev:46964] [Bug #7823]'
|
||||||
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
||||||
next unless /\Asite.*arch.*dir\z/ =~ key
|
next unless /\Asite.*arch.*dir\z/ =~ key
|
||||||
|
next if @@with_config[key]
|
||||||
assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
|
assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -35,6 +46,7 @@ class TestRbConfig < Test::Unit::TestCase
|
||||||
bug7823 = '[ruby-dev:46964] [Bug #7823]'
|
bug7823 = '[ruby-dev:46964] [Bug #7823]'
|
||||||
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
RbConfig::MAKEFILE_CONFIG.each do |key, val|
|
||||||
next unless /\Avendor.*arch.*dir\z/ =~ key
|
next unless /\Avendor.*arch.*dir\z/ =~ key
|
||||||
|
next if @@with_config[key]
|
||||||
assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
|
assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue