ruby-changes:9612
From: yugui <ko1@a...>
Date: Mon, 29 Dec 2008 16:18:31 +0900 (JST)
Subject: [ruby-changes:9612] Ruby:r21151 (ruby_1_9_1): merges r21110, r21111 and r21140 from trunk into ruby_1_9_1.
yugui 2008-12-29 16:18:15 +0900 (Mon, 29 Dec 2008) New Revision: 21151 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21151 Log: merges r21110, r21111 and r21140 from trunk into ruby_1_9_1. * ext/dl/test/test_dl2.rb: modify strncpy, strcpy, qsort, types. Bug #633 [ruby-core:19289] * ext/dl/test/test_base.rb: /lib/libc.so is x86_64 binary in x86_64 architecture. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/ext/dl/test/test_base.rb branches/ruby_1_9_1/ext/dl/test/test_dl2.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21150) +++ ruby_1_9_1/ChangeLog (revision 21151) @@ -1,3 +1,10 @@ +Sun Dec 28 17:10:13 2008 TAKANO Mitsuhiro (takano32) <tak@n...> + + * ext/dl/test/test_dl2.rb: modify strncpy, strcpy, qsort, types. + Patch by Takehiro Kubo. + Bug #633 [ruby-core:19289] + * ext/dl/test/test_base.rb: /lib/libc.so is x86_64 binary in x86_64 architecture. + Sun Dec 28 18:36:33 2008 Yuki Sonoda (Yugui) <yugui@y...> * test/rubygems/test_gem_command.rb Index: ruby_1_9_1/ext/dl/test/test_dl2.rb =================================================================== --- ruby_1_9_1/ext/dl/test/test_dl2.rb (revision 21150) +++ ruby_1_9_1/ext/dl/test/test_dl2.rb (revision 21151) @@ -59,14 +59,14 @@ buff = "xxxx" str = "abc" cfunc = CFunc.new(@libc['strncpy'], TYPE_VOIDP, 'strncpy') - x = cfunc.call([buff,str,3].pack("ppi").unpack("l!*")) + x = cfunc.call([buff,str,3].pack("ppL!").unpack("l!*")) assert_equal("abcx", buff) assert_equal("abcx", CPtr.new(x).to_s(4)) ptr = CPtr.malloc(4) str = "abc" cfunc = CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy') - x = cfunc.call([ptr.to_i,str].pack("lp").unpack("l!*")) + x = cfunc.call([ptr.to_i,str].pack("l!p").unpack("l!*")) assert_equal("abc\0", ptr[0,4]) assert_equal("abc\0", CPtr.new(x).to_s(4)) end @@ -75,7 +75,7 @@ buff = "foobarbaz" cb = set_callback(TYPE_INT,2){|x,y| CPtr.new(x)[0] <=> CPtr.new(y)[0]} cfunc = CFunc.new(@libc['qsort'], TYPE_VOID, 'qsort') - cfunc.call([buff, buff.size, 1, cb].pack("pI!I!L!").unpack("l!*")) + cfunc.call([buff, buff.size, 1, cb].pack("pL!L!L!").unpack("l!*")) assert_equal('aabbfoorz', buff) end Index: ruby_1_9_1/ext/dl/test/test_base.rb =================================================================== --- ruby_1_9_1/ext/dl/test/test_base.rb (revision 21150) +++ ruby_1_9_1/ext/dl/test/test_base.rb (revision 21151) @@ -5,9 +5,6 @@ when /cygwin/ LIBC_SO = "cygwin1.dll" LIBM_SO = "cygwin1.dll" -when /x86_64-linux/ - LIBC_SO = "/lib64/libc.so.6" - LIBM_SO = "/lib64/libm.so.6" when /linux/ LIBC_SO = "/lib/libc.so.6" LIBM_SO = "/lib/libm.so.6" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/