summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-28 06:34:01 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-28 06:34:01 +0000
commite269a71eeb2e360c0882b6c8309b80425d90ddd5 (patch)
tree9d7bfc20b492acaa0e2c60f988bda8608a0712a4
parente858442f4f9ca8dead0413a8fa140be92240f189 (diff)
* test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
mswin/mingw. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/dl/test_base.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a3d676b4fb..27792d167a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 28 15:32:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
+ mswin/mingw.
+
Thu Apr 28 06:07:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/csv.rb (CSV::open): suppress universal newline decorator.
diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
index 3b22ce5b57..4ba0cca6f9 100644
--- a/test/dl/test_base.rb
+++ b/test/dl/test_base.rb
@@ -25,7 +25,7 @@ when /linux/
libm_so = File.join(libdir, "libm.so.6")
when /mingw/, /mswin/
require "rbconfig"
- libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/, 2)[0] + ".dll"
+ libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/).find{|e| /^msvc/ =~ e} + ".dll"
when /darwin/
libc_so = "/usr/lib/libc.dylib"
libm_so = "/usr/lib/libm.dylib"