From f7ef694a712d8deccfba67a4860b0272e335f17a Mon Sep 17 00:00:00 2001 From: mame Date: Wed, 23 Apr 2008 15:22:13 +0000 Subject: * test/ruby/test_settracefunc.rb: add a test for set_trace_func. * test/ruby/envutil.rb: move "rubyexec" method from test_rubyoptions.rb. * test/ruby/test_rubyoptions.rb: use rubyexec in envutil.rb. * test/ruby/test_thread.rb: add tests to achieve over 90% test coverage of thread.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_rubyoptions.rb | 45 ++----------------------------------------- 1 file changed, 2 insertions(+), 43 deletions(-) (limited to 'test/ruby/test_rubyoptions.rb') diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 316f313a2c..3304a17ebf 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -1,44 +1,12 @@ require 'test/unit' -require 'timeout' require 'tmpdir' require 'tempfile' -require 'open3' require_relative 'envutil' class TestRubyOptions < Test::Unit::TestCase - -unless /(mswin|bccwin|mingw|emx)/ =~ RUBY_PLATFORM - - LANG_ENVS = %w"LANG LC_ALL LC_CTYPE" - def ruby(*args) - ruby = EnvUtil.rubybin - c = "C" - env = {} - LANG_ENVS.each {|lc| env[lc], ENV[lc] = ENV[lc], c} - stdin, stdout, stderr = Open3.popen3(*([ruby] + args)) - env.each_pair {|lc, v| - if v - ENV[lc] = v - else - ENV.delete(lc) - end - } - env = nil - Timeout.timeout(10) do - yield(stdin, stdout, stderr) - end - ensure - env.each_pair {|lc, v| - if v - ENV[lc] = v - else - ENV.delete(lc) - end - } if env - stdin .close unless !stdin || stdin .closed? - stdout.close unless !stdout || stdout.closed? - stderr.close unless !stderr || stderr.closed? + def ruby(*r, &b) + EnvUtil.rubyexec(*r, &b) end def test_source_file @@ -484,13 +452,4 @@ unless /(mswin|bccwin|mingw|emx)/ =~ RUBY_PLATFORM assert_equal('', r.read.chomp) end end - -else - - def test_win32 - flunk("cannot test in win32") - end - -end - end -- cgit v1.2.3