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

Commits on Sep 1, 2016

  1. Copy the full SHA
    f64780d View commit details
  2. Kill rspec deprecated form.

    headius committed Sep 1, 2016
    Copy the full SHA
    9522411 View commit details
Showing with 16 additions and 2 deletions.
  1. +14 −0 spec/regression/GH-4122_stdio_fileno_sanity_spec.rb
  2. +2 −2 spec/regression/GH-4124_packed_array_replace_spec.rb
14 changes: 14 additions & 0 deletions spec/regression/GH-4122_stdio_fileno_sanity_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# The fix for stdio disappearing from Drip (#2690) modified stdio streams to report their *actual* fileno rather than
# the standard 0,1,2 typical of a "simple" process. However this broke the childprocess gem on Windows because it
# needs the stdio streams to have reasonable fileno and non-native IO on Windows started to use our fake internal
# fileno. This test is to confirm that any non-native JRuby instance will still have sane fileno for stdio, since
# even if stdio is not on 0,1,2 we can't see it without native integration anyway.
# See #4122.
describe "#4122 Stdio streams in a simple non-native JRuby instance" do
it "should have sane fileno" do
filenos = eval `jruby -Xnative.enabled=false -e 'p [$stdin.fileno,$stdout.fileno,$stderr.fileno]'`
expect(filenos[0]).to eq 0
expect(filenos[1]).to eq 1
expect(filenos[2]).to eq 2
end
end
4 changes: 2 additions & 2 deletions spec/regression/GH-4124_packed_array_replace_spec.rb
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
plus_one = ary.map {|i| i+1}
ary.replace plus_one

ary.should == plus_one
expect(ary).to eq plus_one
end
end
end
end