From 20fa73249505ef1c8ecc2892be75daa2f5b2368a Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 22 Feb 2013 02:36:48 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ test/test_rbconfig.rb | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 572a956d91..289f9269a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 22 11:36:45 2013 Nobuyoshi Nakada + + * test/test_rbconfig.rb (TestRbConfig): skip user defined values by + configuration options. [Bug #7902] + Fri Feb 22 11:33:42 2013 Nobuyoshi Nakada * lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path diff --git a/test/test_rbconfig.rb b/test/test_rbconfig.rb index 49d65e9d06..aa44c4edbf 100644 --- a/test/test_rbconfig.rb +++ b/test/test_rbconfig.rb @@ -1,10 +1,18 @@ require 'test/unit' require 'rbconfig' +require 'shellwords' 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 RbConfig::MAKEFILE_CONFIG.each do |key, val| next unless /\Asite(?!arch)/ =~ key + next if @@with_config[key] assert_match(/(?:\$\(|\/)site/, val, key) end end @@ -12,6 +20,7 @@ class TestRbConfig < Test::Unit::TestCase def test_vendordirs RbConfig::MAKEFILE_CONFIG.each do |key, val| next unless /\Avendor(?!arch)/ =~ key + next if @@with_config[key] assert_match(/(?:\$\(|\/)vendor/, val, key) end end @@ -19,6 +28,7 @@ class TestRbConfig < Test::Unit::TestCase def test_archdirs RbConfig::MAKEFILE_CONFIG.each do |key, val| next unless /\A(?!site|vendor|archdir\z).*arch.*dir\z/ =~ key + next if @@with_config[key] assert_match(/\$\(arch|\$\(rubyarchprefix\)/, val, key) end end @@ -27,6 +37,7 @@ class TestRbConfig < Test::Unit::TestCase bug7823 = '[ruby-dev:46964] [Bug #7823]' RbConfig::MAKEFILE_CONFIG.each do |key, val| next unless /\Asite.*arch.*dir\z/ =~ key + next if @@with_config[key] assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}") end end @@ -35,6 +46,7 @@ class TestRbConfig < Test::Unit::TestCase bug7823 = '[ruby-dev:46964] [Bug #7823]' RbConfig::MAKEFILE_CONFIG.each do |key, val| next unless /\Avendor.*arch.*dir\z/ =~ key + next if @@with_config[key] assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}") end end