summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-09 03:36:18 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-09 03:36:18 +0000
commit321be14fe7418356073a6bddc1fcb8ce841d3a46 (patch)
treeba9aa9904260bc74ba57f50c0d0ec39bf8a8b543
parent23aef380e045d6e81f053f254233d0f299a5e82a (diff)
* test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
* test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc and libm version numbers for detecting default libc and libm. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--test/dl/test_base.rb4
-rw-r--r--test/fiddle/helper.rb12
3 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b044ce4488..5cb5e93d38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Aug 9 12:20:33 2011 Naohisa Goto <ngotogenome@gmail.com>
+
+ * test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
+
+ * test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc
+ and libm version numbers for detecting default libc and libm.
+
Tue Aug 9 09:18:04 2011 Eric Hodel <drbrain@segment7.net>
* ext/zlib/zlib.c (gzfile_wrap): Document encoding options.
diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
index 4ba0cca6f9..0642f0ed89 100644
--- a/test/dl/test_base.rb
+++ b/test/dl/test_base.rb
@@ -45,8 +45,8 @@ when /solaris/
# 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")
+ libc_so = File.join(libdir, "libc.so")
+ libm_so = File.join(libdir, "libm.so")
when /aix/
pwd=Dir.pwd
libc_so = libm_so = "#{pwd}/libaixdltest.so"
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index a95a43a963..ad69f55e69 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -38,6 +38,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")
+ libm_so = File.join(libdir, "libm.so")
when /aix/
pwd=Dir.pwd
libc_so = libm_so = "#{pwd}/libaixdltest.so"