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

Commits on Sep 5, 2017

  1. Modify test to align with MRI. See #4761.

    @headius
    headius committed Sep 5, 2017
    Copy the full SHA
    9853efc View commit details

  2. Tweak toplevel return test to run on JRuby and unexclude.

    @headius
    headius committed Sep 5, 2017
    Copy the full SHA
    22c9c83 View commit details
Showing with 2 additions and 3 deletions.
  1. +0 −1 test/mri/excludes/TestSyntax.rb
  2. +2 −2 test/mri/ruby/test_syntax.rb
1 change: 0 additions & 1 deletion test/mri/excludes/TestSyntax.rb
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
exclude :test_heredoc_newline, "needs investigation"
exclude :test_integer_suffix, "needs investigation"
exclude :test_invalid_next, "needs investigation"
exclude :test_return_toplevel, "uses RubyVM"
exclude :test_syntax_error_in_rescue, "needs investigation"
exclude :test_warn_unreachable, "needs investigation"
exclude :test_warning_literal_in_condition, "needs investigation"
4 changes: 2 additions & 2 deletions test/mri/ruby/test_syntax.rb
View file
Original file line number Diff line number Diff line change
@@ -945,7 +945,7 @@ def test_return_toplevel
begin;
return; raise
begin return; rescue SystemExit; exit false; end
begin return; ensure exit false; end
begin return; ensure puts "ensured"; end #=> ensured
begin ensure return; end
begin raise; ensure; return; end
begin raise; rescue; return; end
@@ -956,7 +956,7 @@ def test_return_toplevel
code.each_line do |s|
s.chomp!
a.for(s) do
assert_ruby_status([], s, proc {RubyVM::InstructionSequence.compile(s).disasm})
assert_ruby_status([], s, proc {RubyVM::InstructionSequence.compile(s).disasm rescue s})
end
end
end