summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-26 10:14:01 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-26 10:14:01 +0000
commit42e9fc4110dc6607332fe05c2e2f4e565fd1b5fd (patch)
treec5bb4cf473732ec0b2fe81e983c63d84d21fc7d2
parent7b918be3d43a043abfa47772da90e856cdd7a355 (diff)
* bootstraptest/test_thread.rb: try to `join' each 100
threads. This benchmark seems consuming long time on travis-ci several times (and make `failure'). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--bootstraptest/test_thread.rb4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 014360d49e..cd3607835d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 26 19:10:53 2012 Koichi Sasada <ko1@atdot.net>
+
+ * bootstraptest/test_thread.rb: try to `join' each 100
+ threads.
+ This benchmark seems consuming long time on travis-ci
+ several times (and make `failure').
+
Mon Nov 26 18:22:56 2012 Koichi Sasada <ko1@atdot.net>
* common.mk: specify label `built-ruby'.
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index 2494cccbf3..19799ab4d3 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -380,7 +380,9 @@ assert_equal 'ok', %q{
assert_equal 'ok', %q{
begin
- 10000.times { Thread.new(true) {|x| x == false } }
+ 100.times{
+ (1..100).map{ Thread.new(true) {|x| x == false } }.each{|th| th.join}
+ }
rescue NoMemoryError, StandardError
end
:ok