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: 6baf5f44bf57
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7ddb5f7407f9
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 7, 2017

  1. Exclude tests for randomized hash calculation. 

    We do not randomize all hash calculation, even though MRI made
the decision to do that at some point. I have opened #4708 to
track this and a possible reimplementation of our Hash to compare
to the open-adressing version introduced in MRI 2.4.
    @headius
    headius committed Jul 7, 2017
    Copy the full SHA
    157e137 View commit details

  2. Revert "Exclude MRI syntax test that appears to hang." 

    This reverts commit 39c81e4.
    @headius
    headius committed Jul 7, 2017
    Copy the full SHA
    7ddb5f7 View commit details
Showing with 14 additions and 1 deletion.
  1. +7 −0 test/mri/excludes/TestHash.rb
  2. +7 −0 test/mri/excludes/TestHash/TestSubHash.rb
  3. +0 −1 test/mri/excludes/TestSyntax.rb
7 changes: 7 additions & 0 deletions test/mri/excludes/TestHash.rb
View file
Original file line number Diff line number Diff line change
@@ -14,3 +14,10 @@
exclude :test_reject, "needs investigation"
exclude :test_AREF_fstring_key, "Depends on MRI-specific GC.stat key"
exclude :test_ASET_fstring_key, "due https://github.com/jruby/jruby/commit/f3f0091da7d98c5df285"

# These are all excluded as a group because we do not generally randomize hashes.
# We may want or need to follow MRI lead here if we are concerned about the other hashDOS vectors.
# See https://bugs.ruby-lang.org/issues/13002
exclude :test_float_hash_random, "JRuby does not randomize hash calculation for Hash"
exclude :test_integer_hash_random, "JRuby does not randomize hash calculation for Hash"
exclude :test_symbol_hash_random, "JRuby does not randomize hash calculation for Hash"
7 changes: 7 additions & 0 deletions test/mri/excludes/TestHash/TestSubHash.rb
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
exclude :test_AREF_fstring_key, "Depends on MRI-specific GC.stat key"
exclude :test_ASET_fstring_key, "due https://github.com/jruby/jruby/commit/f3f0091da7d98c5df285"

# These are all excluded as a group because we do not generally randomize hashes.
# We may want or need to follow MRI lead here if we are concerned about the other hashDOS vectors.
# See https://bugs.ruby-lang.org/issues/13002
exclude :test_float_hash_random, "JRuby does not randomize hash calculation for Hash"
exclude :test_integer_hash_random, "JRuby does not randomize hash calculation for Hash"
exclude :test_symbol_hash_random, "JRuby does not randomize hash calculation for Hash"
1 change: 0 additions & 1 deletion test/mri/excludes/TestSyntax.rb
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,5 @@
exclude :test_duplicated_when, "needs investigation"
exclude :test_integer_suffix, "needs investigation"
exclude :test_invalid_next, "needs investigation"
exclude :test_syntax_error_in_rescue, "hangs"
exclude :test_warn_unreachable, "needs investigation"
exclude :test_warning_literal_in_condition, "needs investigation"