merge revision(s) 34106:

	* test/test_pty.rb (test_pty_check_default): call PTY.check until
	  "cat" command is finished.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a7f6f907d3..4f1ce84e0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 15 14:57:00 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_pty.rb (test_pty_check_default): call PTY.check until
+	  "cat" command is finished.
+
 Sun Apr 15 14:54:16 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_process.rb (TestProcess#windows?): new method.
diff --git a/test/test_pty.rb b/test/test_pty.rb
index 025cafc8f8..3b3aa57ab9 100644
--- a/test/test_pty.rb
+++ b/test/test_pty.rb
@@ -172,8 +172,9 @@ class TestPTY < Test::Unit::TestCase
       st1 = PTY.check(pid)
       w.close
       r.close
-      sleep(0.1)
-      st2 = PTY.check(pid)
+      begin
+        sleep(0.1)
+      end until st2 = PTY.check(pid)
     end
     assert_equal(pid, st1.pid) if st1
     assert_nil(st1)
diff --git a/version.h b/version.h
index b255e86065..7c5e188588 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 183
+#define RUBY_PATCHLEVEL 184
 
 #define RUBY_RELEASE_DATE "2012-04-15"
 #define RUBY_RELEASE_YEAR 2012