naruse	2012-11-21 00:29:59 +0900 (Wed, 21 Nov 2012)

  New Revision: 37773

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

  Log:
    * test/ruby/test_m17n_comb.rb (test_str_crypt): Use RbConfig to get
      libc's directory. Patched by Vit Ondruch [ruby-core:49763] [Bug #7312]

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_m17n_comb.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37772)
+++ ChangeLog	(revision 37773)
@@ -1,3 +1,8 @@
+Wed Nov 21 00:28:18 2012  NARUSE, Yui  <naruse@r...>
+
+	* test/ruby/test_m17n_comb.rb (test_str_crypt): Use RbConfig to get
+	  libc's directory. Patched by Vit Ondruch [ruby-core:49763] [Bug #7312]
+
 Tue Nov 20 23:28:26 2012  Masaki Matsushita  <glass.saga@g...>
 
 	* marshal.c: add marshal readahead. marshalized Array, Hash and Struct
Index: test/ruby/test_m17n_comb.rb
===================================================================
--- test/ruby/test_m17n_comb.rb	(revision 37772)
+++ test/ruby/test_m17n_comb.rb	(revision 37773)
@@ -722,7 +722,7 @@
   def test_str_crypt
     begin
       # glibc 2.16 or later denies salt contained other than [0-9A-Za-z./] #7312
-      glibcver = `/lib/libc.so.6`[/\AGNU C Library.*version ([0-9.]+)/, 1].split('.').map(&:to_i)
+      glibcver = `#{RbConfig::CONFIG["libdir"]}/libc.so.6`[/\AGNU C Library.*version ([0-9.]+)/, 1].split('.').map(&:to_i)
       strict_crypt = (glibcver <=> [2, 16]) > -1
     rescue
     end

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