diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 09:10:34 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 09:10:34 +0000 |
| commit | 6968f3a0fd1e06a057376948e3747dc7307e6a1a (patch) | |
| tree | 0192959c65cc6812710bb3d1ecefed75156e0977 | |
| parent | 54c011a92fcc93dbf3bd5f4cb587196510fb3d1f (diff) | |
Revert previous commit because it was a mistake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rubygems/test_case.rb | 11 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 3 insertions, 20 deletions
@@ -1,9 +1,3 @@ -Fri Apr 22 17:49:34 2016 Hiroshi Shirosaki <[email protected]> - - * lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path. - https://github.com/rubygems/rubygems/pull/1554 - [Bug #12193][ruby-core:74431] - Fri Apr 1 00:41:17 2016 NAKAMURA Usaku <[email protected]> * test/rubygems/test_gem_commands_environment_command.rb (test_execute): diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 574a1149d0..328731d4ea 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -247,17 +247,6 @@ class Gem::TestCase < MiniTest::Unit::TestCase @tempdir.untaint end - # This makes the tempdir consistent on Windows. - # Dir.tmpdir may return short path name, but Dir[Dir.tmpdir] returns long - # path name. https://bugs.ruby-lang.org/issues/10819 - # File.expand_path or File.realpath doesn't convert path name to long path - # name. Only Dir[] (= Dir.glob) works. - # Short and long path name is specific to Windows filesystem. - if win_platform? - @tempdir = Dir[@tempdir][0] - @tempdir.untaint - end - @gemhome = File.join @tempdir, 'gemhome' @userhome = File.join @tempdir, 'userhome' ENV["GEM_SPEC_CACHE"] = File.join @tempdir, 'spec_cache' @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.10" -#define RUBY_RELEASE_DATE "2016-04-22" -#define RUBY_PATCHLEVEL 493 +#define RUBY_RELEASE_DATE "2016-04-01" +#define RUBY_PATCHLEVEL 492 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 1 #include "ruby/version.h" |