summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_rubyoptions.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d48fb8428..27ac90c1be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 25 01:11:36 2011 Naohisa Goto <ngotogenome@gmail.com>
+
+ * test/ruby/test_rubyoptions.rb (test_script_from_stdin): slave pty
+ should be manipulated because master pty may not be a tty on some
+ environment (e.g. Solaris). [Bug:#5222] [ruby-dev:44420]
+
Wed Aug 24 15:13:56 2011 Koichi Sasada <ko1@atdot.net>
* iseq.h, iseq.c, compile.c: Change the line number data structure
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 1bce8e0565..83f7761c52 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -514,7 +514,7 @@ class TestRubyOptions < Test::Unit::TestCase
IO.pipe {|r, w|
begin
PTY.open {|m, s|
- m.echo = false
+ s.echo = false
m.print("\C-d")
pid = spawn(EnvUtil.rubybin, :in => s, :out => w)
w.close
@@ -530,7 +530,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_equal("", result, '[ruby-dev:37798]')
IO.pipe {|r, w|
PTY.open {|m, s|
- m.echo = false
+ s.echo = false
pid = spawn(EnvUtil.rubybin, :in => s, :out => w)
w.close
m.print("$stdin.read; p $stdin.gets\n\C-d")