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

Commits on Apr 21, 2015

  1. Add spec for unselectable channels in IO.select.

    @headius
    headius committed Apr 21, 2015
    Copy the full SHA
    28490d4 View commit details

  2. Ugh...dup env hash since we'll probably modify it.

    @headius
    headius committed Apr 21, 2015
    Copy the full SHA
    543177b View commit details

  3. Remove a couple working excludes.

    @headius
    headius committed Apr 21, 2015
    Copy the full SHA
    e7c7beb View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/io/PopenExecutor.java
View file
Original file line number Diff line number Diff line change
@@ -1183,7 +1183,7 @@ static void execargFixup(ThreadContext context, Ruby runtime, ExecArg eargp) {
}
else {
envtbl = runtime.getObject().getConstant("ENV");
envtbl = TypeConverter.convertToType(envtbl, runtime.getHash(), "to_hash");
envtbl = TypeConverter.convertToType(envtbl, runtime.getHash(), "to_hash").dup();
}
if (envopts != null) {
RubyHash stenv = (RubyHash)envtbl;
12 changes: 12 additions & 0 deletions spec/regression/unselectable_channels_should_be_ready_in_select_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
describe "An unselectable (for read) channel" do
it "is considered ready by IO.select" do
bios = java.io.ByteArrayInputStream.new('hello'.to_java_bytes)
ch = java.nio.channels.Channels.new_channel(bios)
io = ch.to_io

reads, * = IO.select([io], nil, nil, 1000)

expect(reads.size).to eq(1)
expect(reads[0]).to eq(io)
end
end
2 changes: 0 additions & 2 deletions test/mri/excludes/TestProcess.rb
View file
Original file line number Diff line number Diff line change
@@ -35,8 +35,6 @@
exclude :test_gid_re_exchangeable_p, "unimplemented"
exclude :test_gid_sid_available?, "unimplemented"
exclude :test_no_curdir, "out of memory error"
exclude :test_popen_cloexec, "unsupported"
exclude :test_popen_noshell, "fails on linux (Travis)"
exclude :test_popen_wordsplit, "needs investigation"
exclude :test_popen_wordsplit_beginning_and_trailing_spaces, "needs investigation"
exclude :test_process_detach, "uses fork"