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

Commits on Jul 20, 2017

  1. Exclude a few more MRI-specific code dumping formats.

    @headius
    headius committed Jul 20, 2017
    Copy the full SHA
    b74ff3f View commit details

  2. Dedupe keys for Signal.list. This could be more efficient. Meh.

    @headius
    headius committed Jul 20, 2017
    Copy the full SHA
    4d076d8 View commit details
Showing with 6 additions and 4 deletions.
  1. +2 −2 core/src/main/java/org/jruby/RubySignal.java
  2. +4 −2 test/mri/excludes/TestRubyOptions.rb
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/RubySignal.java
View file
Original file line number Diff line number Diff line change
@@ -99,9 +99,9 @@ public static IRubyObject list(ThreadContext context, IRubyObject recv) {
Ruby runtime = recv.getRuntime();
RubyHash names = RubyHash.newHash(runtime);
for (Map.Entry<String, Integer> sig : RubySignal.list().entrySet()) {
names.op_aset(context, runtime.newString(sig.getKey()), runtime.newFixnum(sig.getValue()));
names.op_aset(context, runtime.freezeAndDedupString(runtime.newString(sig.getKey())), runtime.newFixnum(sig.getValue()));
}
names.op_aset(context, runtime.newString("EXIT"), runtime.newFixnum(0));
names.op_aset(context, runtime.freezeAndDedupString(runtime.newString("EXIT")), runtime.newFixnum(0));
return names;
}

6 changes: 4 additions & 2 deletions test/mri/excludes/TestRubyOptions.rb
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
exclude :test_chdir, "needs investigation"
exclude :test_copyright, "needs investigation"
exclude :test_debug, "needs investigation"
exclude :test_dump_syntax_with_rflag, "needs investigation"
exclude :test_dump_yydebug_with_rflag, "needs investigation"
exclude :test_dump_insns_with_rflag, "MRI-specific format"
exclude :test_dump_parsetree_with_rflag, "MRI-specific format"
exclude :test_dump_syntax_with_rflag, "MRI-specific format"
exclude :test_dump_yydebug_with_rflag, "MRI-specific format"
exclude :test_encoding, "needs investigation"
exclude :test_eval, "needs investigation"
exclude :test_frozen_string_literal_debug, "needs investigation #4303"