merges r22717 from trunk into ruby_1_9_1.

--
* test/dl: moved from ext/dl/test.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

8 files changed, 7 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 52fe053c3..2b8f12ad7 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.
+
 Sat Sep  5 10:38:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (iseq_compile_each): &&= and ||= should return rhs.
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)
diff --git a/version.h b/version.h
index 9e0a1c2e0..83ec872be 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 315
+#define RUBY_PATCHLEVEL 316
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1