naruse	2013-02-13 15:35:19 +0900 (Wed, 13 Feb 2013)

  New Revision: 39216

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

  Log:
    merge revision(s) 39209:
    
    Get libc's path by ldd [Bug #7828] [ruby-core:52129]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_m17n_comb.rb

Index: ruby_2_0_0/test/ruby/test_m17n_comb.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_m17n_comb.rb	(revision 39215)
+++ ruby_2_0_0/test/ruby/test_m17n_comb.rb	(revision 39216)
@@ -722,7 +722,8 @@ class TestM17NComb < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_m17n_comb.rb#L722
   def test_str_crypt
     begin
       # glibc 2.16 or later denies salt contained other than [0-9A-Za-z./] #7312
-      glibcver = `#{RbConfig::CONFIG["libdir"]}/libc.so.6`[/\AGNU C Library.*version ([0-9.]+)/, 1].split('.').map(&:to_i)
+      glibcpath = `ldd #{RbConfig.ruby}`[/\S+\/libc.so\S+/]
+      glibcver = `#{glibcpath}`[/\AGNU C Library.*version ([0-9.]+)/, 1].split('.').map(&:to_i)
       strict_crypt = (glibcver <=> [2, 16]) > -1
     rescue
     end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39209


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