diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | test/test_rbconfig.rb | 12 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 23 insertions, 1 deletions
@@ -1,3 +1,13 @@ +Sat Mar 9 22:18:43 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * test/test_rbconfig.rb (TestRbConfig): fix r39372. + It must see RbConfig::CONFIG instead of CONFIG. + +Sat Mar 9 22:18:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/test_rbconfig.rb (TestRbConfig): skip user defined values by + configuration options. [Bug #7902] + Sat Mar 9 22:07:53 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit): diff --git a/test/test_rbconfig.rb b/test/test_rbconfig.rb index 49d65e9d06..36204500bd 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(RbConfig::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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-09" -#define RUBY_PATCHLEVEL 30 +#define RUBY_PATCHLEVEL 31 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 |