aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorshirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-04 12:45:31 +0000
committershirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-04 12:45:31 +0000
commit0dc94b8b3e6c9440c05f18387c7dc8207094d89a (patch)
treeedeedd0ca289b4f926f8ac494b4752279289ec6c /ChangeLog
parent4ef43fc02f9446da4eaa508c439d3caa1a244ebf (diff)
downloadruby-0dc94b8b3e6c9440c05f18387c7dc8207094d89a.tar.gz
test_pstore.rb: fix for timeout
* test/ruby/envutil.rb (EnvUtil#invoke_ruby): show Timeout::Error instead of IOError if the timeout has expired. * test/test_pstore.rb (PStoreTest#test_pstore_files_are_accessed_as_binary_files): increase timeout because this test is slow on Windows. [ruby-core:47402] [Bug #6965] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d6ec4c89b..b66d141124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Sep 4 20:55:17 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+
+ * test/ruby/envutil.rb (EnvUtil#invoke_ruby): show Timeout::Error
+ instead of IOError if the timeout has expired.
+
+ * test/test_pstore.rb
+ (PStoreTest#test_pstore_files_are_accessed_as_binary_files):
+ increase timeout because this test is slow on Windows.
+ [ruby-core:47402] [Bug #6965]
+
Tue Sep 4 11:28:57 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
* vm_eval.c (ruby_eval_string_from_file_protect): initializer