diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-06-09 15:05:50 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-06-09 15:21:14 +0900 |
| commit | 2267c7478dfd2d120008b2b97ae484fa11a78d26 (patch) | |
| tree | 59ece4c54fa409eb439e7bb5b4be150db2426e7f /test/envutil.rb | |
| parent | c99c41a1d5e13468290b8a974fd12063bf992f2a (diff) | |
| parent | 3f037dc1b4717b63ad293356477768a011cb5473 (diff) | |
| download | ruby-openssl-2267c7478dfd2d120008b2b97ae484fa11a78d26.tar.gz | |
Merge changes from Ruby trunk r55224..r55335
And adjust tests for test-unit.
* ruby-trunk r55224..r55335: (16 commits)
(r55335) openssl: fix build with OpenSSL 1.1.0 and no pkg-config
(r55314) openssl: adjust tests for OpenSSL 1.1.0
(r55309) openssl: add SSL::SSLContext#security_level{=,}
(r55304) openssl: avoid deprecated version-specific ssl methods if n..
(r55294) openssl: fix free function of OpenSSL::Cipher
(r55291) openssl: fix compile on VC
(r55289) openssl: use SSL_is_server()
(r55288) openssl: avoid d2i_ASN1_BOOLEAN()
(r55287) openssl: adapt to OpenSSL 1.1.0 opaque structs
(r55285) openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
(r55283) openssl: support OpenSSL 1.1.0's new multi-threading API
(r55282) openssl: check existence of RAND_pseudo_bytes()
(r55273) openssl: avoid deprecated BN_*prime* functions
(r55252) ossl_asn1.c: check overflow
(r55249) openssl: fix the Year 2038 problem
(r55229) openssl: add missing test for r55219
Sync-with-trunk: r55335
Diffstat (limited to 'test/envutil.rb')
| -rw-r--r-- | test/envutil.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/envutil.rb b/test/envutil.rb index 39d13301..ac2a3c0c 100644 --- a/test/envutil.rb +++ b/test/envutil.rb @@ -368,9 +368,10 @@ module Test line -= 5 # lines until src src = <<eom # -*- coding: #{src.encoding}; -*- - require #{__dir__.dump}'/test/unit';include Test::Unit::Assertions + require 'test/unit';include Test::Unit::Assertions END { - puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}" + puts [Marshal.dump($!)].pack('m')#, "assertions=\#{self._assertions}" + exit } #{src} class Test::Unit::Runner @@ -382,7 +383,7 @@ eom stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, **opt) abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig)) assert(!abort, FailDesc[status, nil, stderr]) - self._assertions += stdout[/^assertions=(\d+)/, 1].to_i + #self._assertions += stdout[/^assertions=(\d+)/, 1].to_i begin res = Marshal.load(stdout.unpack("m")[0]) rescue => marshal_error |