diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-20 15:29:59 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-20 15:29:59 +0000 |
commit | 9d71f70da9f30528675f07228687106a69f05b3b (patch) | |
tree | 5c7f1bf5ce500c1ef60326a5a6d1a17266117dcf | |
parent | 132eb25a79fee6c24d6a68da2f0de74ee3229517 (diff) | |
download | ruby-9d71f70da9f30528675f07228687106a69f05b3b.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_m17n_comb.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb index 903e0de134..904c6095e7 100644 --- a/test/ruby/test_m17n_comb.rb +++ b/test/ruby/test_m17n_comb.rb @@ -722,7 +722,7 @@ class TestM17NComb < Test::Unit::TestCase 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 |