summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-10 10:45:51 +0000
committerwanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-10 10:45:51 +0000
commitf9afb1d21dca79c94aa76b564882d60e97bb708a (patch)
tree87be52ef3d492d54856eb238e3851de5b88543a0
parent6b147c13a11a1c5fa8c9d841386812daa47a7e77 (diff)
downloadruby-f9afb1d21dca79c94aa76b564882d60e97bb708a.tar.gz
ruby-f9afb1d21dca79c94aa76b564882d60e97bb708a.tar.xz
ruby-f9afb1d21dca79c94aa76b564882d60e97bb708a.zip
* test/ruby/envutil.rb (assert_normal_exit): r17993 revert.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 5622b06d4..c8d182cb6 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 09d5d3a09..b9af6ff9c 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