ruby-changes:15751
From: yugui <ko1@a...>
Date: Sun, 9 May 2010 01:00:41 +0900 (JST)
Subject: [ruby-changes:15751] Ruby:r27679 (ruby_1_9_2): * test/dl/test_base.rb (libc_so, libm_so): supports solaris.
yugui 2010-05-09 01:00:23 +0900 (Sun, 09 May 2010) New Revision: 27679 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27679 Log: * test/dl/test_base.rb (libc_so, libm_so): supports solaris. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/test/dl/test_base.rb Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 27678) +++ ruby_1_9_2/ChangeLog (revision 27679) @@ -1,3 +1,7 @@ +Sun May 9 00:35:56 2010 Yuki Sonoda (Yugui) <yugui@y...> + + * test/dl/test_base.rb (libc_so, libm_so): supports solaris. + Sun May 9 00:27:46 2010 Nobuyoshi Nakada <nobu@r...> * thread.c (rb_thread_aset): fixed argument type. Index: ruby_1_9_2/test/dl/test_base.rb =================================================================== --- ruby_1_9_2/test/dl/test_base.rb (revision 27678) +++ ruby_1_9_2/test/dl/test_base.rb (revision 27679) @@ -35,6 +35,18 @@ when /bsd|dragonfly/ libc_so = "/usr/lib/libc.so" libm_so = "/usr/lib/libm.so" +when /solaris/ + libdir = '/lib' + case [0].pack('L!').size + when 4 + # 32-bit ruby + libdir = '/lib' if File.directory? '/lib' + when 8 + # 64-bit ruby + libdir = '/lib/64' if File.directory? '/lib/64' + end + libc_so = File.join(libdir, "libc.so.6") + libm_so = File.join(libdir, "libm.so.6") else libc_so = ARGV[0] if ARGV[0] && ARGV[0][0] == ?/ libm_so = ARGV[1] if ARGV[1] && ARGV[1][0] == ?/ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/