diff options
author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-09 03:36:18 +0000 |
---|---|---|
committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-09 03:36:18 +0000 |
commit | 321be14fe7418356073a6bddc1fcb8ce841d3a46 (patch) | |
tree | ba9aa9904260bc74ba57f50c0d0ec39bf8a8b543 /test | |
parent | 23aef380e045d6e81f053f254233d0f299a5e82a (diff) | |
download | ruby-321be14fe7418356073a6bddc1fcb8ce841d3a46.tar.gz |
* 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
Diffstat (limited to 'test')
-rw-r--r-- | test/dl/test_base.rb | 4 | ||||
-rw-r--r-- | test/fiddle/helper.rb | 12 |
2 files changed, 14 insertions, 2 deletions
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" |