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

Commits on Feb 15, 2016

  1. unnecessary cast and make runtime local final

    @kares
    kares committed Feb 15, 2016
    Copy the full SHA
    aae3409 View commit details

  2. [test] Process#test_no_curdir won't behave as before due WD change de… 

    …tection

... since 1e30600 (see GH-3653)
    @kares
    kares committed Feb 15, 2016
    Copy the full SHA
    b619b66 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −2 core/src/main/java/org/jruby/RubyKernel.java
  2. +1 −0 test/mri/excludes/TestProcess.rb
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/RubyKernel.java
View file
Original file line number Diff line number Diff line change
@@ -1519,7 +1519,7 @@ public static IRubyObject system(ThreadContext context, IRubyObject recv, IRubyO

@JRubyMethod(name = "system", required = 1, rest = true, module = true, visibility = PRIVATE)
public static IRubyObject system19(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
Ruby runtime = context.runtime;
final Ruby runtime = context.runtime;
boolean needChdir = !runtime.getCurrentDirectory().equals(runtime.getPosix().getcwd());

if (!needChdir && runtime.getPosix().isNative() && !Platform.IS_WINDOWS) {
@@ -1560,7 +1560,7 @@ public static IRubyObject system19(ThreadContext context, IRubyObject recv, IRub

// else old JDK logic
if (args[0] instanceof RubyHash) {
RubyHash env = (RubyHash) args[0].convertToHash();
RubyHash env = args[0].convertToHash();
if (env != null) {
runtime.getENV().merge_bang(context, env, Block.NULL_BLOCK);
}
1 change: 1 addition & 0 deletions test/mri/excludes/TestProcess.rb
View file
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@
exclude :test_fd_inheritance, "needs investigation"
exclude :test_gid_re_exchangeable_p, "unimplemented"
exclude :test_gid_sid_available?, "unimplemented"
exclude :test_no_curdir, "won't work due changed wd detection (since 1e30600bdbbf483a)"
exclude :test_popen_cloexec, "unsupported"
exclude :test_popen_noshell, "fails on linux (Travis)"
exclude :test_popen_wordsplit, "needs investigation"