diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-06-19 23:25:32 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-06-19 23:32:17 +0900 |
| commit | e1c7ee1bb3e13fa4fe0f200cf9a8cd3531c45d39 (patch) | |
| tree | 0e0f781de70fa607c5275401ba7a881d4039bdbe /test/envutil.rb | |
| parent | 3b8046d83ce3271d20c182054e44caf9270d4429 (diff) | |
| parent | 9ead0ecaa2f500cf19e7cfb484d21c401c4c4ca4 (diff) | |
| download | ruby-openssl-e1c7ee1bb3e13fa4fe0f200cf9a8cd3531c45d39.tar.gz | |
Merge changes from Ruby trunk r55335..r55457
Also adjust tests.
* ruby-trunk r55335..r55457: (15 commits)
(r55457) openssl: add OpenSSL::OCSP::SingleResponse
(r55456) openssl: allow passing absolute times in OCSP::BasicRespons..
(r55455) openssl: implement initialize_copy for OpenSSL::OCSP::*
(r55454) openssl: implement initialize_copy method for PKey classes
(r55450) openssl: add 'const's required in OpenSSL master
(r55444) openssl: avoid test crash on Ubuntu 16.04
(r55423) openssl: refactor OpenSSL::OCSP::*#verify
(r55422) openssl: allow specifying hash algorithm in OCSP::*#sign
(r55411) openssl: add some accessor methods for OCSP::CertificateId
(r55409) openssl: add missing #to_der to OCSP::{CertificateId,BasicR..
(r55408) openssl: fix acesssor functions for RSA and DH in openssl_m..
(r55388) openssl: support non AES-GCM AEAD ciphers in OpenSSL::Cipher
(r55387) openssl: avoid test failure in test_engine.rb
(r55344) openssl: use ASN1_ENUMERATED_to_BN() if needed
(r55342) openssl: fix build with OPENSSL_NO_EC
Sync-with-trunk: r55457
Diffstat (limited to 'test/envutil.rb')
| -rw-r--r-- | test/envutil.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/envutil.rb b/test/envutil.rb index ac2a3c0c..a4964c2c 100644 --- a/test/envutil.rb +++ b/test/envutil.rb @@ -365,7 +365,7 @@ module Test file ||= loc.path line ||= loc.lineno end - line -= 5 # lines until src + line -= 6 # lines until src src = <<eom # -*- coding: #{src.encoding}; -*- require 'test/unit';include Test::Unit::Assertions @@ -373,6 +373,7 @@ module Test puts [Marshal.dump($!)].pack('m')#, "assertions=\#{self._assertions}" exit } + def pend(msg = nil) $stdout.syswrite [Marshal.dump(msg.to_s)].pack("m"); exit! 0 end #{src} class Test::Unit::Runner @@stop_auto_run = true @@ -389,7 +390,9 @@ eom rescue => marshal_error ignore_stderr = nil end - if res + if res.is_a?(String) + pend res + elsif res if bt = res.backtrace bt.each do |l| l.sub!(/\A-:(\d+)/){"#{file}:#{line + $1.to_i}"} |