diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-31 13:04:40 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-31 13:04:40 +0000 |
commit | f7665cbaa3e3c8752bd001431f840516a254c0e7 (patch) | |
tree | 665cd2bd99f5abc0e19da3cc3529edaeaf3647a3 | |
parent | 5beab8043a7a6fe238240ea73b9c8d735ef8e726 (diff) |
merges r22717 from trunk into ruby_1_9_1.
--
* test/dl: moved from ext/dl/test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/dl/test/test_all.rb | 11 | ||||
-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 | ||||
-rw-r--r-- | version.h | 2 |
8 files changed, 7 insertions, 13 deletions
@@ -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 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 index 11243dfebd..11243dfebd 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 3c854aea8f..3c854aea8f 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 be937719df..be937719df 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 8514f8298e..8514f8298e 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 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) @@ -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 |