summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--test/ruby/envutil.rb4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5622b06d48..c8d182cb6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Thu Jul 10 19:38:35 2008 wanabe <s.wanabe@gmail.com>
+ * test/ruby/envutil.rb (assert_normal_exit): r17993 revert.
+
Thu Jul 10 18:29:41 2008 wanabe <s.wanabe@gmail.com>
* test/ruby/envutil.rb (assert_normal_exit): finish writing script
before spawn("ruby") to avoid blocking in win32.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 09d5d3a09d..b9af6ff9cc 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -74,11 +74,11 @@ module Test
def assert_normal_exit(testsrc, message = '')
in_c, in_p = IO.pipe
out_p, out_c = IO.pipe
- in_p.write testsrc
- in_p.close
pid = spawn(EnvUtil.rubybin, '-W0', STDIN=>in_c, STDOUT=>out_c, STDERR=>out_c)
in_c.close
out_c.close
+ in_p.write testsrc
+ in_p.close
msg = out_p.read
out_p.close
Process.wait pid