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

Commits on Mar 1, 2016

  1. Fixes to io/console and pty to get 2.3 test_io_console running.

    * pty: make PTR.spawn pass all args through.
    * io/console: make IO.console send sym + args to @Console.
    headius committed Mar 1, 2016
    Copy the full SHA
    7a23753 View commit details
  2. Copy the full SHA
    a6ba916 View commit details
  3. Copy the full SHA
    99da572 View commit details
Showing with 6 additions and 4 deletions.
  1. +2 −1 lib/ruby/stdlib/io/console.rb
  2. +1 −1 lib/ruby/stdlib/pty.rb
  3. +1 −1 samples/ffi/pty.rb
  4. +1 −0 test/mri/excludes/TestException.rb
  5. +1 −1 test/mri/ruby/test_thread.rb
3 changes: 2 additions & 1 deletion lib/ruby/stdlib/io/console.rb
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/pty.rb
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion samples/ffi/pty.rb
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions test/mri/excludes/TestException.rb
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion test/mri/ruby/test_thread.rb
Original file line number Diff line number Diff line change
@@ -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