diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-01 13:10:37 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-01 13:10:37 +0000 |
commit | d5802c512eb4508c606a4038d900eb610611fbb2 (patch) | |
tree | 234b8066238a761f0e2d06624af19995b3ed9e50 /test/ruby/envutil.rb | |
parent | a7c425cbf32f70b53caa178f1f16cec168ecb456 (diff) |
* test/openssl/test_ssl_session.rb (test_ctx_client_session_cb): Don't
ignore errors of SSL accept.
(test_ctx_server_session_cb): Ditto.
* test/openssl/utils.rb (server_loop): Add ignore_ssl_accept_error
argument.
(start_server): Refine threads waits.
* test/ruby/envutil.rb (assert_join_threads): Show a thread before
backtrace.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/envutil.rb')
-rw-r--r-- | test/ruby/envutil.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 0d5d6f9173..55657a0762 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -529,13 +529,14 @@ eom begin values << th.value rescue Exception - errs << $! + errs << [th, $!] end end if !errs.empty? - msg = errs.map {|err| + msg = errs.map {|t, err| err.backtrace.map.with_index {|line, i| if i == 0 + "#{t.inspect}:\n" + "#{line}: #{err.message} (#{err.class})" else "\tfrom #{line}" |