summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-08 16:05:27 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-08 16:05:27 +0000
commitffde073b0c2875ccfc23d09d74c351000bbcb969 (patch)
tree03523f69ca08666904458e68a2ab27b86c979a6e
parent8f3e3995df3697f4fdf6ea30b9340c51947812c5 (diff)
* test/dl/test_base.rb (libc_so, libm_so): supports solaris.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27681 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/dl/test_base.rb12
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 872990b55d..618811b0b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 9 00:35:56 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/dl/test_base.rb (libc_so, libm_so): supports solaris.
+
Sat May 8 19:03:31 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* spec/default.mspec (config): . is no longer in $:.
diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
index b8fca3c610..c9b54193f8 100644
--- a/test/dl/test_base.rb
+++ b/test/dl/test_base.rb
@@ -35,6 +35,18 @@ when /kfreebsd/
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] == ?/