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

Commits on Apr 30, 2018

  1. Properly use refinements composed of included modules.

    @headius
    headius committed Apr 30, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    436bb89 View commit details

Commits on May 2, 2018

  1. Exclude timing-sensitive signal+subprocess test.

    @headius
    headius committed May 2, 2018
    Copy the full SHA
    223d253 View commit details
Showing with 2 additions and 3 deletions.
  1. +1 −1 core/src/main/java/org/jruby/RubyModule.java
  2. +0 −2 test/mri/excludes/TestRefinement.rb
  3. +1 −0 test/mri/excludes/TestThread.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyModule.java
View file
Original file line number Diff line number Diff line change
@@ -846,7 +846,7 @@ private static void usingModuleRecursive(RubyModule cref, RubyModule refinedModu

RubyModule realRefinedModule;
if (refinedModule instanceof IncludedModule) {
realRefinedModule = refinedModule.getMetaClass();
realRefinedModule = ((IncludedModule) refinedModule).getDelegate();
} else if (refinedModule.isModule()) {
realRefinedModule = refinedModule;
} else {
2 changes: 0 additions & 2 deletions test/mri/excludes/TestRefinement.rb
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,6 @@
exclude :test_inspect, "needs investigation"
exclude :test_main_using_is_private, "needs investigation"
exclude :test_making_private_method_public, "needs investigation"
exclude :test_module_inclusion, "needs investigation"
exclude :test_module_inclusion2, "needs investigation"
exclude :test_module_using_in_method, "needs investigation"
exclude :test_module_using_invalid_self, "needs investigation"
exclude :test_new_method_on_subclass, "needs investigation"
1 change: 1 addition & 0 deletions test/mri/excludes/TestThread.rb
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
exclude :test_recursive_outer, "expected to be fixed by our change based on MRI r43981 but was not"
exclude :test_report_on_exception, "very sensitive to thread timing and parallelism"
exclude :test_safe_level, "SAFE levels are unsupported"
exclude :test_signal_at_join, "very timing-sensitive and very edge casey"
exclude :test_thread_join_in_trap, "fails intermittently (#4956)"
exclude :test_thread_join_main_thread, "hangs"
exclude :test_thread_setname_in_initialize, "needs investigation #4308"