naruse	2012-04-15 14:57:08 +0900 (Sun, 15 Apr 2012)

  New Revision: 35335

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35335

  Log:
    merge revision(s) 34106:
    
    * test/test_pty.rb (test_pty_check_default): call PTY.check until
      "cat" command is finished.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/test_pty.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35334)
+++ ruby_1_9_3/ChangeLog	(revision 35335)
@@ -1,3 +1,8 @@
+Sun Apr 15 14:57:00 2012  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* test/ruby/test_process.rb (TestProcess#windows?): new method.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35334)
+++ ruby_1_9_3/version.h	(revision 35335)
@@ -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
Index: ruby_1_9_3/test/test_pty.rb
===================================================================
--- ruby_1_9_3/test/test_pty.rb	(revision 35334)
+++ ruby_1_9_3/test/test_pty.rb	(revision 35335)
@@ -172,8 +172,9 @@
       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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/