Permalink
Browse files

* 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 132eb25 commit 9d71f70da9f30528675f07228687106a69f05b3b @nurse nurse committed Nov 20, 2012
Showing with 6 additions and 1 deletion.
  1. +5 −0 ChangeLog
  2. +1 −1 test/ruby/test_m17n_comb.rb
View
5 ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 21 00:28:18 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * 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@gmail.com>
* marshal.c: add marshal readahead. marshalized Array, Hash and Struct
View
2 test/ruby/test_m17n_comb.rb
@@ -722,7 +722,7 @@ def test_str_count
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

0 comments on commit 9d71f70

Please sign in to comment.