aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 11:15:36 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 11:15:36 +0000
commit88201504aea9d0d62310c3cc931d6ed2127e58f4 (patch)
treed70fbcc9f155685d9fef76a8d86d37ef0a6967a3 /test
parent7ca1927af1d36c9388fc5eee86597ab94f54f311 (diff)
downloadruby-88201504aea9d0d62310c3cc931d6ed2127e58f4.tar.gz
* test/ruby/memory_status.rb (Memory::Win32): rescue non libffi user, such as ko1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/memory_status.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb
index a13f414697..eaf962340a 100644
--- a/test/ruby/memory_status.rb
+++ b/test/ruby/memory_status.rb
@@ -15,7 +15,12 @@ module Memory
read_status {|k, v| keys << k; vals << v}
when /mswin|mingw/ =~ RUBY_PLATFORM
- require 'fiddle/import'
+ begin
+ require 'fiddle/import'
+ rescue LoadError
+ require 'dl/import'
+ ::Fiddle = ::DL
+ end
require 'dl/types'
module Win32