Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ddec5e238c22
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c54357cd075a
Choose a head ref
  • 3 commits
  • 119 files changed
  • 1 contributor

Commits on Jul 6, 2017

  1. Copy the full SHA
    5526914 View commit details
  2. Bump Ruby compat to 2.4.1.

    headius committed Jul 6, 2017
    Copy the full SHA
    077ffea View commit details
  3. Rev to 9.2-snapshot.

    headius committed Jul 6, 2017
    Copy the full SHA
    c54357c View commit details
Showing with 3,675 additions and 1,153 deletions.
  1. +1 −1 VERSION
  2. +3 −3 default.build.properties
  3. +18 −0 test/mri/-ext-/exception/test_exception_at_throwing.rb
  4. +1 −0 test/mri/-ext-/string/test_modify_expand.rb
  5. +263 −66 test/mri/bigdecimal/test_bigdecimal.rb
  6. +22 −0 test/mri/csv/test_csv_parsing.rb
  7. +2 −2 test/mri/fiddle/test_import.rb
  8. +16 −3 test/mri/fileutils/test_fileutils.rb
  9. +31 −0 test/mri/io/console/test_io_console.rb
  10. +4 −4 test/mri/lib/envutil.rb
  11. +3 −1 test/mri/lib/leakchecker.rb
  12. +0 −2 test/mri/lib/memory_status.rb
  13. +3 −2 test/mri/lib/test/unit.rb
  14. +20 −32 test/mri/lib/test/unit/assertions.rb
  15. +1 −2 test/mri/lib/test/unit/parallel.rb
  16. +176 −22 test/mri/logger/test_logdevice.rb
  17. +66 −0 test/mri/net/fixtures/cacert.pem
  18. +29 −0 test/mri/net/fixtures/dhparams.pem
  19. +48 −0 test/mri/net/fixtures/server.crt
  20. +15 −0 test/mri/net/fixtures/server.key
  21. +651 −89 test/mri/net/ftp/test_ftp.rb
  22. +23 −24 test/mri/net/http/test_https.rb
  23. +1 −1 test/mri/net/http/utils.rb
  24. +3 −3 test/mri/net/imap/test_imap.rb
  25. +3 −3 test/mri/net/smtp/test_smtp.rb
  26. +35 −4 test/mri/open-uri/test_ssl.rb
  27. +156 −194 test/mri/openssl/test_asn1.rb
  28. +1 −0 test/mri/openssl/test_buffering.rb
  29. +230 −252 test/mri/openssl/test_cipher.rb
  30. +1 −0 test/mri/openssl/test_config.rb
  31. +16 −21 test/mri/openssl/test_digest.rb
  32. +0 −7 test/mri/openssl/test_engine.rb
  33. +19 −25 test/mri/openssl/test_hmac.rb
  34. +1 −0 test/mri/openssl/test_ns_spki.rb
  35. +5 −7 test/mri/openssl/test_ocsp.rb
  36. +7 −13 test/mri/openssl/test_pair.rb
  37. +4 −10 test/mri/openssl/test_pkcs12.rb
  38. +4 −7 test/mri/openssl/test_pkcs7.rb
  39. +20 −0 test/mri/openssl/test_pkey_dsa.rb
  40. +19 −1 test/mri/openssl/test_pkey_ec.rb
  41. +22 −0 test/mri/openssl/test_pkey_rsa.rb
  42. +17 −11 test/mri/openssl/test_ssl.rb
  43. +25 −59 test/mri/openssl/test_x509cert.rb
  44. +7 −12 test/mri/openssl/test_x509crl.rb
  45. +1 −0 test/mri/openssl/test_x509ext.rb
  46. +13 −2 test/mri/openssl/test_x509name.rb
  47. +1 −0 test/mri/openssl/test_x509req.rb
  48. +14 −15 test/mri/openssl/test_x509store.rb
  49. +19 −9 test/mri/openssl/utils.rb
  50. +1 −0 test/mri/ostruct/test_ostruct.rb
  51. +10 −0 test/mri/rdoc/test.ja.rdoc
  52. +4 −4 test/mri/readline/test_readline.rb
  53. +18 −0 test/mri/rexml/test_element.rb
  54. +25 −25 test/mri/rinda/test_rinda.rb
  55. +18 −0 test/mri/ripper/test_ripper.rb
  56. +8 −8 test/mri/ruby/enc/test_case_comprehensive.rb
  57. +25 −0 test/mri/ruby/enc/test_case_mapping.rb
  58. +6 −6 test/mri/ruby/enc/test_case_options.rb
  59. +68 −0 test/mri/ruby/enc/test_utf32.rb
  60. +0 −7 test/mri/ruby/marshaltestlib.rb
  61. +28 −7 test/mri/ruby/test_argf.rb
  62. +28 −4 test/mri/ruby/test_array.rb
  63. +1 −1 test/mri/ruby/test_complex.rb
  64. +8 −8 test/mri/ruby/test_complexrational.rb
  65. +0 −2 test/mri/ruby/test_dir.rb
  66. +3 −1 test/mri/ruby/test_dir_m17n.rb
  67. +1 −0 test/mri/ruby/test_enum.rb
  68. +20 −0 test/mri/ruby/test_exception.rb
  69. +8 −0 test/mri/ruby/test_fiber.rb
  70. +1 −1 test/mri/ruby/test_file.rb
  71. +18 −3 test/mri/ruby/test_file_exhaustive.rb
  72. +21 −0 test/mri/ruby/test_flip.rb
  73. +51 −0 test/mri/ruby/test_float.rb
  74. +54 −2 test/mri/ruby/test_hash.rb
  75. +20 −4 test/mri/ruby/test_integer.rb
  76. +95 −1 test/mri/ruby/test_io.rb
  77. +2 −2 test/mri/ruby/test_io_m17n.rb
  78. +50 −6 test/mri/ruby/test_keyword.rb
  79. +27 −25 test/mri/ruby/test_lambda.rb
  80. +3 −0 test/mri/ruby/test_literal.rb
  81. +12 −5 test/mri/ruby/test_m17n.rb
  82. +15 −0 test/mri/ruby/test_marshal.rb
  83. +22 −3 test/mri/ruby/test_object.rb
  84. +40 −0 test/mri/ruby/test_pack.rb
  85. +5 −3 test/mri/ruby/test_parse.rb
  86. +4 −1 test/mri/ruby/test_process.rb
  87. +33 −7 test/mri/ruby/test_rational.rb
  88. +97 −0 test/mri/ruby/test_refinement.rb
  89. +76 −5 test/mri/ruby/test_regexp.rb
  90. +2 −2 test/mri/ruby/test_require.rb
  91. +5 −0 test/mri/ruby/test_rubyoptions.rb
  92. +5 −0 test/mri/ruby/test_sprintf.rb
  93. +101 −13 test/mri/ruby/test_string.rb
  94. +52 −5 test/mri/ruby/test_symbol.rb
  95. +59 −0 test/mri/ruby/test_syntax.rb
  96. +18 −0 test/mri/ruby/test_thread.rb
  97. +10 −0 test/mri/ruby/test_time.rb
  98. +10 −9 test/mri/ruby/test_unicode_escape.rb
  99. +2 −2 test/mri/ruby/test_variable.rb
  100. +1 −1 test/mri/ruby/test_yield.rb
  101. +40 −21 test/mri/rubygems/test_gem.rb
  102. +23 −0 test/mri/rubygems/test_gem_ext_ext_conf_builder.rb
  103. +34 −17 test/mri/rubygems/test_gem_ext_rake_builder.rb
  104. +2 −2 test/mri/rubygems/test_gem_remote_fetcher.rb
  105. +3 −3 test/mri/rubygems/test_gem_resolver.rb
  106. +16 −0 test/mri/rubygems/test_gem_server.rb
  107. +1 −1 test/mri/rubygems/test_gem_specification.rb
  108. +61 −0 test/mri/rubygems/test_gem_stub_specification.rb
  109. +6 −0 test/mri/rubygems/test_gem_version.rb
  110. +25 −0 test/mri/rubygems/test_require.rb
  111. +47 −0 test/mri/stringio/test_stringio.rb
  112. +34 −4 test/mri/test_mathn.rb
  113. +11 −0 test/mri/test_tempfile.rb
  114. +19 −2 test/mri/thread/test_queue.rb
  115. +8 −10 test/mri/uri/test_mailto.rb
  116. +17 −0 test/mri/webrick/test_config.rb
  117. +48 −10 test/mri/webrick/test_httpproxy.rb
  118. +49 −1 test/mri/zlib/test_zlib.rb
  119. 0 tool/{globals_2_4_0.rb → globals_2_4_1.rb}
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.1.11.0-SNAPSHOT
9.2.0.0-SNAPSHOT
6 changes: 3 additions & 3 deletions default.build.properties
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ rake.args=
install4j.executable=/Applications/install4j 4/bin/install4jc

# Ruby versions
version.ruby=2.4.0
version.ruby=2.4.1
version.ruby.major=2.4
version.ruby.minor=0
version.ruby.revision=56780
version.ruby.minor=1
version.ruby.revision=58053
18 changes: 18 additions & 0 deletions test/mri/-ext-/exception/test_exception_at_throwing.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# frozen_string_literal: true
require 'test/unit'

module Bug
class TestException < Test::Unit::TestCase
def test_exception_at_throwing
assert_separately(%w[-r-test-/exception], "#{<<-"begin;"}\n#{<<-"end;"}")
begin;
e = RuntimeError.new("[Bug #13176]")
assert_raise_with_message(e.class, e.message) do
catch do |t|
Bug::Exception.ensure_raise(nil, e) {throw t}
end
end
end;
end
end
end
1 change: 1 addition & 0 deletions test/mri/-ext-/string/test_modify_expand.rb
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ def test_modify_expand_memory_leak
end

def test_integer_overflow
return if RbConfig::SIZEOF['size_t'] > RbConfig::SIZEOF['long']
bug12390 = '[ruby-core:75592] [Bug #12390]'
s = Bug::String.new
long_max = (1 << (8 * RbConfig::SIZEOF['long'] - 1)) - 1
Loading