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

Commits on Nov 5, 2014

  1. Exclude new Ripper failures.

    @headius
    headius committed Nov 5, 2014
    Copy the full SHA
    a9d1364 View commit details

  2. Fix the failed return value, which should still be null.

    @headius
    headius committed Nov 5, 2014
    Copy the full SHA
    5749d57 View commit details

  3. Replace return with break. 

    The server body here is inside a closure with a while loop. It
appears that the original commit wanted to have a way to terminate
the server gracefully by doing a non-local return that should
bubble out. However, when using a threaded server the result is
a LocalJumpError since return is not valid in a thread.

We believe this should be a break instead of a return, since it
just wants to escape the request-handling loop. This change allows
MRI trunk tests for net/http to pass on JRuby the same way they
did before.
    @headius
    headius committed Nov 5, 2014
    Copy the full SHA
    ce7e292 View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/Ruby.java
View file
Original file line number Diff line number Diff line change
@@ -790,7 +790,7 @@ private ScriptAndCode tryCompile(Node node, JRubyClassLoader classLoader) {
LOG.error(e);
}
}
return new ScriptAndCode(null, null);
return null;
}
}

2 changes: 1 addition & 1 deletion lib/ruby/stdlib/webrick/server.rb
View file
Original file line number Diff line number Diff line change
@@ -173,7 +173,7 @@ def start(&block)
begin
if svrs = IO.select([shutdown_pipe_r, *@listeners], nil, nil, 2.0)
if svrs[0].include? shutdown_pipe_r
return
break
end
svrs[0].each{|svr|
@tokens.pop # blocks while no token is there.
Empty file removed test/mri/excludes/TestRipper.rb
View file
Empty file.
4 changes: 4 additions & 0 deletions test/mri/excludes/TestRipper/ParserEvents.rb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
exclude :test_assign_error, "needs investigation"
exclude :test_assign_error_const, "needs investigation"
exclude :test_assign_error_const_qualified, "needs investigation"
exclude :test_assign_error_const_toplevel, "needs investigation"
exclude :test_assoc_splat, "needs investigation"
exclude :test_block_var, "needs investigation"
exclude :test_block_variables, "needs investigation"
exclude :test_blockarg, "needs investigation"
exclude :test_def, "needs investigation"
exclude :test_defs, "needs investigation"
exclude :test_dyna_symbol, "needs investigation"
exclude :test_event_coverage, "needs investigation"
exclude :test_excessed_comma, "needs investigation"
exclude :test_invalid_class_variable_name, "needs investigation"
1 change: 1 addition & 0 deletions test/mri/excludes/TestRipper/Ripper.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
exclude :test_column, "needs investigation"
exclude :test_encoding, "needs investigation"
exclude :test_filename, "needs investigation"
exclude :test_lineno, "needs investigation"
exclude :test_yydebug_equals, "needs investigation"
3 changes: 3 additions & 0 deletions test/mri/excludes/TestRipper/ScannerEvents.rb
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,9 @@
exclude :test_heredoc_beg, "needs investigation"
exclude :test_heredoc_end, "needs investigation"
exclude :test_ignored_nl, "needs investigation"
exclude :test_imaginary, "needs parser support for imaginary literals"
exclude :test_kw, "needs investigation"
exclude :test_label_end, "needs investigation"
exclude :test_lbrace, "needs investigation"
exclude :test_lbracket, "needs investigation"
exclude :test_lex, "needs investigation"
@@ -27,6 +29,7 @@
exclude :test_period, "needs investigation"
exclude :test_qsymbols_beg, "needs investigation"
exclude :test_qwords_beg, "needs investigation"
exclude :test_rational, "needs parser support for rational literals"
exclude :test_rbrace, "needs investigation"
exclude :test_rbracket, "needs investigation"
exclude :test_regexp_beg, "needs investigation"
1 change: 1 addition & 0 deletions test/mri/excludes/TestRipper/Sexp.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude :test_compile_error, "needs investigation"