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

Commits on Jul 29, 2016

  1. Copy the full SHA
    cbad0d5 View commit details
  2. Copy the full SHA
    107ed8f View commit details
  3. Copy the full SHA
    e9313f4 View commit details
  4. Copy the full SHA
    3fc3353 View commit details
Original file line number Diff line number Diff line change
@@ -80,6 +80,7 @@ TestGenerationPrefix::WithMountedEngine:
ActionController::LiveStreamTest:
- test_exception_callback_when_committed
- test_async_stream # fails on travis
- test_abort_with_full_buffer # fails intermittently on CI
ApplicationIntegrationTest:
- test_missing_route_helper_after_controller_access
- test_missing_route_helper_before_controller_access
3 changes: 2 additions & 1 deletion lib/ruby/truffle/jruby+truffle/lib/truffle/config.rb
Original file line number Diff line number Diff line change
@@ -134,7 +134,8 @@ def gem(gem_name, *requirements)
end
# activate
require "minitest/reporters"
Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
reporter_class = ENV["CI"] ? Minitest::Reporters::SpecReporter : Minitest::Reporters::ProgressReporter
Minitest::Reporters.use! reporter_class.new
RUBY
}.reduce({}) do |h, (k, v)|
file_name = format '%s.rb', k
8 changes: 8 additions & 0 deletions spec/ruby/core/kernel/select_spec.rb
Original file line number Diff line number Diff line change
@@ -9,4 +9,12 @@

describe "Kernel.select" do
it "needs to be reviewed for spec completeness"

it 'does not block when timeout is 0' do
IO.pipe do |read, write|
IO.select([read], [], [], 0).should == nil
write.write 'data'
IO.select([read], [], [], 0).should == [[read], [], []]
end
end
end
Original file line number Diff line number Diff line change
@@ -491,8 +491,9 @@ public void newLexicalVersion() {
}

public void newVersion(Set<DynamicObject> alreadyInvalidated, boolean considerLexicalDependents) {
if (alreadyInvalidated.contains(rubyModuleObject))
if (alreadyInvalidated.contains(rubyModuleObject)) {
return;
}

unmodifiedAssumption.invalidate();
alreadyInvalidated.add(rubyModuleObject);
@@ -516,8 +517,9 @@ public void addDependent(DynamicObject dependent) {

public void addLexicalDependent(DynamicObject lexicalChild) {
assert RubyGuards.isRubyModule(lexicalChild);
if (lexicalChild != rubyModuleObject)
if (lexicalChild != rubyModuleObject) {
lexicalDependents.add(lexicalChild);
}
}

public Assumption getUnmodifiedAssumption() {