diff options
| -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 |