summaryrefslogtreecommitdiff
path: root/test/ruby/test_require.rb
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-05 11:10:05 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-05 11:10:05 +0000
commit11f9b8c05c1f5cb76e9998f539d855f1bea6ecff (patch)
tree322d16949852d849aa86c1318eb199ebadbac4e1 /test/ruby/test_require.rb
parent74ba0cfc622925c2527b3d281802a3d1ab86363d (diff)
Don't insert an entry to loading_tbl if another thread succeed to load.
If rb_thread_shield_wait() returns Qfalse, the file has been successfully loaded by another thread, so there is no need to insert a new entry into loading_tbl. [ruby-core:78464] [Bug #12999] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_require.rb')
-rw-r--r--test/ruby/test_require.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index cc18bf06b8..7b5b79d862 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -697,9 +697,9 @@ class TestRequire < Test::Unit::TestCase
bug7530 = '[ruby-core:50645]'
Tempfile.create(%w'bug-7530- .rb') {|script|
script.close
- assert_in_out_err([{"RUBYOPT" => nil}, "-", script.path], <<-INPUT, %w(:ok), [], bug7530, timeout: 20)
+ assert_in_out_err([{"RUBYOPT" => nil}, "-", script.path], <<-INPUT, %w(:ok), [], bug7530, timeout: 40)
PATH = ARGV.shift
- THREADS = 2
+ THREADS = 4
ITERATIONS_PER_THREAD = 1000
THREADS.times.map {