diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-19 12:17:53 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-19 12:17:53 +0000 |
commit | 8ff7f8952adc660a28388b3a26ca6c4e93233b86 (patch) | |
tree | 30542fe51e65a027a46e0def1fb59c60b18a16f3 /test/fiddle | |
parent | 75e7f2ff2d23c8a148558c71c88157635ba3fda3 (diff) |
merge revision(s) 44598,44599,44600:
/usr/lib/libc.so is not symlink on FreeBSD 10
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/fiddle')
-rw-r--r-- | test/fiddle/helper.rb | 3 | ||||
-rw-r--r-- | test/fiddle/test_handle.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb index e5cbecd1db..7f8fe131d6 100644 --- a/test/fiddle/helper.rb +++ b/test/fiddle/helper.rb @@ -37,6 +37,9 @@ when /kfreebsd/ when /gnu/ #GNU/Hurd libc_so = "/lib/libc.so.0.3" libm_so = "/lib/libm.so.6" +when /freebsd/ + libc_so = "/lib/libc.so.7" + libm_so = "/lib/libm.so.5" when /bsd|dragonfly/ libc_so = "/usr/lib/libc.so" libm_so = "/usr/lib/libm.so" diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb index f11272abbf..ccdce7bf45 100644 --- a/test/fiddle/test_handle.rb +++ b/test/fiddle/test_handle.rb @@ -180,7 +180,7 @@ module Fiddle # In general uses of dlerror(3) should call it before use it. require 'socket' Socket.gethostbyname("localhost") - Fiddle.dlopen("/usr/lib/libc.so").sym('strcpy') + Fiddle.dlopen("/lib/libc.so.7").sym('strcpy') end if /freebsd/=~ RUBY_PLATFORM end end |