jruby · Apr 25, 2018 · Apr 25, 2018 · Apr 25, 2018 · Apr 25, 2018
Showing with 10 additions and 6 deletions.

+7 −6 core/src/main/java/org/jruby/RubyProc.java

+1 −0 test/mri/excludes/TestProcess.rb

+1 −0 test/mri/excludes/TestRubyOptimization.rb

+1 −0 test/mri/excludes/TestRubyOptions.rb
diff --git a/core/src/main/java/org/jruby/RubyProc.java b/core/src/main/java/org/jruby/RubyProc.java
@@ -215,16 +215,12 @@ public IRubyObject dup() {
     }
 
     @Override
-    public IRubyObject to_s() {
-        return to_s19();
-    }
-
     @JRubyMethod(name = "to_s", alias = "inspect")
-    public IRubyObject to_s19() {
+    public IRubyObject to_s() {
         Ruby runtime = getRuntime();
         RubyString string = runtime.newString("#<");
 
-        string.append(types(runtime, getMetaClass()));
+        string.append(types(runtime, type()));
         string.catString(":0x" + Integer.toString(System.identityHashCode(block), 16));
 
         String file = block.getBody().getFile();
@@ -349,4 +345,9 @@ public final IRubyObject call19(ThreadContext context, IRubyObject[] args, Block
         return call(context, args, block);
     }
 
+    @Deprecated
+    public IRubyObject to_s19() {
+        return to_s();
+    }
+
 }
diff --git a/test/mri/excludes/TestProcess.rb b/test/mri/excludes/TestProcess.rb
@@ -45,6 +45,7 @@
 exclude :test_fd_inheritance, "unimplemented: cyclic redirects in child are not supported"
 exclude :test_gid_re_exchangeable_p, "unimplemented"
 exclude :test_gid_sid_available?, "unimplemented"
+exclude :test_initgroups, "unimplemented"
 exclude :test_kill_at_spawn_failure, "thread lifecycle at process boundaries?"
 exclude :test_no_curdir, "won't work due changed wd detection (since 1e30600bdbbf483a)"
 exclude :test_popen_exit, "terminates test run"

diff --git a/test/mri/excludes/TestRubyOptimization.rb b/test/mri/excludes/TestRubyOptimization.rb
@@ -8,6 +8,7 @@
 exclude :test_string_freeze, "frozen string literal should be a new object if String#freeze is redefined (#2156)"
 exclude :test_string_freeze_block, "frozen string literal revert to a call if String#freeze is redefined (#2156)"
 exclude :test_string_freeze_saves_memory, "depends on ObjectSpace#memsize_of"
+exclude :test_string_uminus, "frozen string literal revert to a call if String#-@ is redefined (#2156)"
 exclude :test_tailcall, "needs investigation"
 exclude :test_tailcall_condition_block, "depends on RubyVM"
 exclude :test_tailcall_inhibited_by_block, "depends on RubyVM"

diff --git a/test/mri/excludes/TestRubyOptions.rb b/test/mri/excludes/TestRubyOptions.rb
@@ -1,6 +1,7 @@
 exclude :test_assignment_in_conditional, "line numbers don't match MRI"
 exclude :test_chdir, "needs investigation"
 exclude :test_copyright, "needs investigation"
+exclude :test_cwd_encoding, "can't do chdir and env yet #5145"
 exclude :test_debug, "needs investigation"
 exclude :test_dump_insns_with_rflag, "MRI-specific format"
 exclude :test_dump_parsetree_with_rflag, "MRI-specific format"