mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/ruby/test_file_exhaustive.rb (setup): workaround for Windows
Vista. * test/ruby/envutil.rb (rubyexec): now Open3.open3 is supported on Windows. * test/ruby/test_process.rb: use ``||'' instead of ``;'' because cmd.exe not support it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
95698ff2a4
commit
1de486b600
4 changed files with 16 additions and 10 deletions
|
@ -697,7 +697,7 @@ class TestProcess < Test::Unit::TestCase
|
|||
File.open("result2", "w") {|t| t << "taki pid=#{$$} ppid=#{Process.ppid}" }
|
||||
exit 8
|
||||
End
|
||||
ret = system("#{RUBY} script1; #{RUBY} script2")
|
||||
ret = system("#{RUBY} script1 || #{RUBY} script2")
|
||||
status = $?
|
||||
assert_equal(false, ret)
|
||||
assert(status.exited?)
|
||||
|
@ -719,7 +719,7 @@ class TestProcess < Test::Unit::TestCase
|
|||
File.open("result2", "w") {|t| t << "take pid=#{$$} ppid=#{Process.ppid}" }
|
||||
exit 8
|
||||
End
|
||||
pid = spawn("#{RUBY} script1; #{RUBY} script2")
|
||||
pid = spawn("#{RUBY} script1 || #{RUBY} script2")
|
||||
Process.wait pid
|
||||
status = $?
|
||||
assert(status.exited?)
|
||||
|
@ -742,7 +742,7 @@ class TestProcess < Test::Unit::TestCase
|
|||
puts "tika pid=#{$$} ppid=#{Process.ppid}"
|
||||
exit 8
|
||||
End
|
||||
io = IO.popen("#{RUBY} script1; #{RUBY} script2")
|
||||
io = IO.popen("#{RUBY} script1 || #{RUBY} script2")
|
||||
result = io.read
|
||||
io.close
|
||||
status = $?
|
||||
|
@ -765,7 +765,7 @@ class TestProcess < Test::Unit::TestCase
|
|||
End
|
||||
write_file("s", <<-"End")
|
||||
ruby = #{RUBY.dump}
|
||||
exec("\#{ruby} script1; \#{ruby} script2")
|
||||
exec("\#{ruby} script1 || \#{ruby} script2")
|
||||
End
|
||||
pid = spawn RUBY, "s"
|
||||
Process.wait pid
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue