diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-24 02:37:51 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-24 02:37:51 +0000 |
commit | 5bf133eb50127e757f56442c8594a914728140aa (patch) | |
tree | 269ff896cdd2f6f397e020a826f4dd4fcdfbe6cc /test | |
parent | d3a0ef8198bf3257f37cf1149553b77981b85eab (diff) | |
download | ruby-5bf133eb50127e757f56442c8594a914728140aa.tar.gz |
* test/ruby/test_process.rb (test_exec_wordsplit): on win32, exec'ed process is not child but grandchild.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_process.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 1998692460..fd362d418c 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -684,7 +684,13 @@ class TestProcess < Test::Unit::TestCase def test_exec_wordsplit with_tmpchdir {|d| write_file("script", <<-'End') - File.open("result", "w") {|t| t << "hehe pid=#{$$} ppid=#{Process.ppid}" } + File.open("result", "w") {|t| + if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM + t << "hehe ppid=#{Process.ppid}" + else + t << "hehe pid=#{$$} ppid=#{Process.ppid}" + end + } exit 6 End write_file("s", <<-"End") @@ -697,7 +703,12 @@ class TestProcess < Test::Unit::TestCase assert_equal(pid, status.pid) assert(status.exited?) assert_equal(6, status.exitstatus) - assert_equal("hehe pid=#{status.pid} ppid=#{$$}", File.read("result")) + if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM + expected = "hehe ppid=#{status.pid}" + else + expected = "hehe pid=#{status.pid} ppid=#{$$}" + end + assert_equal(expected, File.read("result")) } end |