diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-13 06:35:19 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-13 06:35:19 +0000 |
| commit | 4f05e726f6762535a4ff8d33e518ad6ca26e188a (patch) | |
| tree | 90d7d13d1b1c56858b8ac2eeb461c6b508594ed5 /test | |
| parent | b7b9aa6609b0f49c1f7d2935e5a1e3a13223957e (diff) | |
merge revision(s) 39209:
Get libc's path by ldd [Bug #7828] [ruby-core:52129]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_m17n_comb.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb index 904c6095e7..2de7179996 100644 --- a/test/ruby/test_m17n_comb.rb +++ b/test/ruby/test_m17n_comb.rb @@ -722,7 +722,8 @@ 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 = `#{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 |