summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-03 11:04:55 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-03 11:04:55 +0000
commitbf0dcd5b855e7798b343bbe669f36e98afaf86e1 (patch)
tree2d0b2c2ecbc152f8d2d09ff0c9700cae4fb43324
parent6d9932a28c94c9a3e54cb4783952c2385c794687 (diff)
test/test_tmpdir.rb(TRAVERSAL_PATH): re-apply r62990 partially. [Backport #14966]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/test_tmpdir.rb1
-rw-r--r--version.h6
2 files changed, 4 insertions, 3 deletions
diff --git a/test/test_tmpdir.rb b/test/test_tmpdir.rb
index d05ffc934a..7cdf2bba3a 100644
--- a/test/test_tmpdir.rb
+++ b/test/test_tmpdir.rb
@@ -58,6 +58,7 @@ class TestTmpdir < Test::Unit::TestCase
end
TRAVERSAL_PATH = Array.new(Dir.pwd.split('/').count, '..').join('/') + Dir.pwd + '/'
+ TRAVERSAL_PATH.delete!(':') if /mswin|mingw/ =~ RUBY_PLATFORM
def test_mktmpdir_traversal
expect = Dir.glob(TRAVERSAL_PATH + '*').count
diff --git a/version.h b/version.h
index c1ea3f6f33..9a63e01338 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.5.2"
-#define RUBY_RELEASE_DATE "2018-09-02"
-#define RUBY_PATCHLEVEL 89
+#define RUBY_RELEASE_DATE "2018-09-03"
+#define RUBY_PATCHLEVEL 90
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 3
#include "ruby/version.h"