jruby · Mar 1, 2016 · Mar 1, 2016 · Mar 1, 2016
Showing with 6 additions and 4 deletions.

+2 −1 lib/ruby/stdlib/io/console.rb

+1 −1 lib/ruby/stdlib/pty.rb

+1 −1 samples/ffi/pty.rb

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

+1 −1 test/mri/ruby/test_thread.rb
diff --git a/lib/ruby/stdlib/io/console.rb b/lib/ruby/stdlib/io/console.rb
@@ -167,7 +167,7 @@ def ioflush
       end
 
       # TODO: Windows version uses "conin$" and "conout$" instead of /dev/tty
-      def self.console(sym = nil)
+      def self.console(sym = nil, *args)
         raise TypeError, "expected Symbol, got #{sym.class}" unless sym.nil? || sym.kind_of?(Symbol)
 
         # klass = self == IO ? File : self
@@ -196,6 +196,7 @@ def self.console(sym = nil)
           @console = con
         end
 
+        return con.send(sym, *args) if sym
         return con
       end
     end

diff --git a/lib/ruby/stdlib/pty.rb b/lib/ruby/stdlib/pty.rb
@@ -64,6 +64,6 @@ def self.getpty(*args)
     end
   end
   def self.spawn(*args, &block)
-    self.getpty("/bin/sh", "-c", args[0], &block)
+    self.getpty(*args, &block)
   end
 end
diff --git a/samples/ffi/pty.rb b/samples/ffi/pty.rb
@@ -63,7 +63,7 @@ def self.getpty(*args)
     end
   end
   def self.spawn(*args, &block)
-    self.getpty("/bin/sh", "-c", args[0], &block)
+    self.getpty(*args, &block)
   end
 end
 module LibC

diff --git a/test/mri/excludes/TestException.rb b/test/mri/excludes/TestException.rb
@@ -8,6 +8,7 @@
 exclude :test_errinfo_encoding_in_debug, "parser issue with Japanese encodings (https://github.com/jruby/jruby/issues/3679)"
 exclude /test_machine_stackoverflow/, reason
 exclude :test_machine_stackoverflow_by_define_method, reason
+exclude :test_multibyte_and_newline, "Exception messages always go through Java String for us"
 exclude :test_name_error_local_variables, "NameError#local_variables is internal and specific to MRI"
 exclude :test_output_string_encoding, "Exception messages always go through Java String for us"
 exclude :test_stackoverflow, reason

diff --git a/test/mri/ruby/test_thread.rb b/test/mri/ruby/test_thread.rb
@@ -420,7 +420,7 @@ def test_thread_local
     assert_equal(false, t.key?(:qux))
     assert_equal(false, t.key?("qux"))
 
-    assert_equal([:foo, :bar, :baz], t.keys)
+    assert_equal([:foo, :bar, :baz].sort, t.keys.sort)
 
   ensure
     t.kill if t