From f9ca2119e403653cdf529646d3a3790c5c473ac2 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 3 Mar 2009 06:03:23 +0000 Subject: [PATCH] * test/dl: moved from ext/dl/test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/dl/test/test_all.rb | 11 ----------- {ext/dl/test => test/dl}/test_base.rb | 0 {ext/dl/test => test/dl}/test_dl2.rb | 0 {ext/dl/test => test/dl}/test_func.rb | 0 {ext/dl/test => test/dl}/test_import.rb | 0 {ext/dl/test => test/dl}/test_win32.rb | 3 ++- 7 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 ext/dl/test/test_all.rb rename {ext/dl/test => test/dl}/test_base.rb (100%) rename {ext/dl/test => test/dl}/test_dl2.rb (100%) rename {ext/dl/test => test/dl}/test_func.rb (100%) rename {ext/dl/test => test/dl}/test_import.rb (100%) rename {ext/dl/test => test/dl}/test_win32.rb (94%) diff --git a/ChangeLog b/ChangeLog index 6e65099dcb..d9488a1255 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Mar 3 15:03:19 2009 Nobuyoshi Nakada + + * test/dl: moved from ext/dl/test. + Tue Mar 3 14:57:28 2009 Nobuyoshi Nakada * 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 fb1f4939f9..0000000000 --- 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 similarity index 100% rename from ext/dl/test/test_base.rb rename to test/dl/test_base.rb diff --git a/ext/dl/test/test_dl2.rb b/test/dl/test_dl2.rb similarity index 100% rename from ext/dl/test/test_dl2.rb rename to test/dl/test_dl2.rb diff --git a/ext/dl/test/test_func.rb b/test/dl/test_func.rb similarity index 100% rename from ext/dl/test/test_func.rb rename to test/dl/test_func.rb diff --git a/ext/dl/test/test_import.rb b/test/dl/test_import.rb similarity index 100% rename from ext/dl/test/test_import.rb rename to test/dl/test_import.rb diff --git a/ext/dl/test/test_win32.rb b/test/dl/test_win32.rb similarity index 94% rename from ext/dl/test/test_win32.rb rename to test/dl/test_win32.rb index b2210287a1..b40e3690d8 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)