summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-08-05 13:39:48 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-08-05 13:39:48 +0000
commit6874b1ccbf4c2db118651fd897f7923748733cb4 (patch)
tree759a02846b3c1b157b145fb8ddd083a0cd5c3fbb
parentfabb2fed252c634d9196813d452667e8a0ed80ac (diff)
merge revision(s) 2403f9ac3af170ce0107a709a9cb510fe0501648:
Expand the timeout of `test_pstore_files_are_accessed_as_binary_files` Sometimes causes timeout error on mswin CI git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/test_pstore.rb2
-rw-r--r--version.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/test_pstore.rb b/test/test_pstore.rb
index 9d9e8565ec..52b74f3775 100644
--- a/test/test_pstore.rb
+++ b/test/test_pstore.rb
@@ -133,7 +133,7 @@ class PStoreTest < Test::Unit::TestCase
def test_pstore_files_are_accessed_as_binary_files
bug5311 = '[ruby-core:39503]'
n = 128
- assert_in_out_err(["-Eutf-8:utf-8", "-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311, timeout: 15)
+ assert_in_out_err(["-Eutf-8:utf-8", "-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311, timeout: 30)
@pstore = PStore.new(ARGV[0])
(1..#{n}).each do |i|
@pstore.transaction {@pstore["Key\#{i}"] = "value \#{i}"}
diff --git a/version.h b/version.h
index 4f26133dca..2f5ba41339 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.6.3"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 77
+#define RUBY_PATCHLEVEL 78
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
#include "ruby/version.h"