summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-03 06:03:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-03 06:03:23 +0000
commit6db5a15f86fed964007c205a02b20a88c4de9caa (patch)
treebc0355516dd1ea4e6d90f100726c337502b05dce
parent875544d8c88f33c4e27bd89802fc4ffbb6b63cee (diff)
downloadruby-6db5a15f86fed964007c205a02b20a88c4de9caa.tar.gz
ruby-6db5a15f86fed964007c205a02b20a88c4de9caa.tar.xz
ruby-6db5a15f86fed964007c205a02b20a88c4de9caa.zip
* test/dl: moved from ext/dl/test.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/dl/test/test_all.rb11
-rw-r--r--test/dl/test_base.rb (renamed from ext/dl/test/test_base.rb)0
-rw-r--r--test/dl/test_dl2.rb (renamed from ext/dl/test/test_dl2.rb)0
-rw-r--r--test/dl/test_func.rb (renamed from ext/dl/test/test_func.rb)0
-rw-r--r--test/dl/test_import.rb (renamed from ext/dl/test/test_import.rb)0
-rw-r--r--test/dl/test_win32.rb (renamed from ext/dl/test/test_win32.rb)3
7 files changed, 6 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e65099dc..d9488a125 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 3 15:03:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/dl: moved from ext/dl/test.
+
Tue Mar 3 14:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (main): passes $(MAKE) to mkmain_cmd
diff --git a/ext/dl/test/test_all.rb b/ext/dl/test/test_all.rb
deleted file mode 100644
index fb1f4939f..000000000
--- a/ext/dl/test/test_all.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'test_base'
-require 'dl/import'
-
-require 'test_dl2'
-require 'test_func'
-require 'test_import'
-
-case RUBY_PLATFORM
-when /cygwin/, /mingw32/, /mswin32/, /bccwin32/
- require 'test_win32'
-end
diff --git a/ext/dl/test/test_base.rb b/test/dl/test_base.rb
index 11243dfeb..11243dfeb 100644
--- a/ext/dl/test/test_base.rb
+++ b/test/dl/test_base.rb
diff --git a/ext/dl/test/test_dl2.rb b/test/dl/test_dl2.rb
index 3c854aea8..3c854aea8 100644
--- a/ext/dl/test/test_dl2.rb
+++ b/test/dl/test_dl2.rb
diff --git a/ext/dl/test/test_func.rb b/test/dl/test_func.rb
index be937719d..be937719d 100644
--- a/ext/dl/test/test_func.rb
+++ b/test/dl/test_func.rb
diff --git a/ext/dl/test/test_import.rb b/test/dl/test_import.rb
index 8514f8298..8514f8298 100644
--- a/ext/dl/test/test_import.rb
+++ b/test/dl/test_import.rb
diff --git a/ext/dl/test/test_win32.rb b/test/dl/test_win32.rb
index b2210287a..b40e3690d 100644
--- a/ext/dl/test/test_win32.rb
+++ b/test/dl/test_win32.rb
@@ -33,6 +33,7 @@ module Win32API
end
end
module_function :get_version_ex
+rescue DL::DLError
end
module DL
@@ -50,4 +51,4 @@ class TestWin32 < TestBase
assert_equal(expect, platform)
end
end
-end
+end if defined?(Win32API::OSVERSIONINFO)