nagachika	2013-03-09 22:19:15 +0900 (Sat, 09 Mar 2013)

  New Revision: 39661

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39661

  Log:
    merge revision(s) 39372,39383: [Backport #7912]
    
    * test/test_rbconfig.rb (TestRbConfig): skip user defined values by
      configuration options.  [Bug #7902]
    
    * test/test_rbconfig.rb (TestRbConfig): fix r39372.
      It must see RbConfig::CONFIG instead of CONFIG.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/test_rbconfig.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39660)
+++ ruby_2_0_0/ChangeLog	(revision 39661)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 22:18:43 2013  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
+
+	* test/test_rbconfig.rb (TestRbConfig): skip user defined values by
+	  configuration options.  [Bug #7902]
+
 Sat Mar  9 22:07:53 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39660)
+++ ruby_2_0_0/version.h	(revision 39661)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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
Index: ruby_2_0_0/test/test_rbconfig.rb
===================================================================
--- ruby_2_0_0/test/test_rbconfig.rb	(revision 39660)
+++ ruby_2_0_0/test/test_rbconfig.rb	(revision 39661)
@@ -1,10 +1,18 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_rbconfig.rb#L1
 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::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_rbconfig.rb#L20
   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::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_rbconfig.rb#L28
   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::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_rbconfig.rb#L37
     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::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_rbconfig.rb#L46
     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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39372,39383


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/