kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* test/ruby/test_m17n_comb.rb (test_str_crypt): Use RbConfig to get

Browse source 
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
This commit is contained in:
naruse 2012-11-20 15:29:59 +00:00
parent 132eb25a79
commit 9d71f70da9
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Nov 20 23:28:26 2012 Masaki Matsushita <glass.saga@gmail.com>
* marshal.c: add marshal readahead. marshalized Array, Hash and Struct * marshal.c: add marshal readahead. marshalized Array, Hash and Struct

2
test/ruby/test_m17n_comb.rb
View file

@ -722,7 +722,7 @@ class TestM17NComb < Test::Unit::TestCase
def test_str_crypt def test_str_crypt
begin begin
# glibc 2.16 or later denies salt contained other than [0-9A-Za-z./] #7312 # 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 strict_crypt = (glibcver <=> [2, 16]) > -1
rescue rescue
end end