From f21faba0df422d4e582e0b1db027536ca52a73be Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 17 Apr 2008 11:13:34 +0000 Subject: * test/ruby/test_rubyoptions.rb (test_search): enable some assertions. * test/ruby/test_rubyoptions.rb: flunk message in win32. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_rubyoptions.rb | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'test/ruby/test_rubyoptions.rb') diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 01872b936..316f313a2 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -1,7 +1,5 @@ require 'test/unit' -unless /(mswin|bccwin|mingw|emx)/ =~ RUBY_PLATFORM - require 'timeout' require 'tmpdir' require 'tempfile' @@ -9,6 +7,9 @@ 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 @@ -412,15 +413,15 @@ class TestRubyOptions < Test::Unit::TestCase ENV['PATH'] = File.dirname(t.path) ruby('-S', File.basename(t.path)) do |w, r, e| -# assert_equal('', e.read) -# assert_equal('1', r.read) + assert_equal('', e.read) + assert_equal('1', r.read.chomp) end ENV['RUBYPATH'] = File.dirname(t.path) ruby('-S', File.basename(t.path)) do |w, r, e| -# assert_equal('', e.read) -# assert_equal('1', r.read) + assert_equal('', e.read) + assert_equal('1', r.read.chomp) end ensure @@ -483,10 +484,13 @@ class TestRubyOptions < Test::Unit::TestCase assert_equal('', r.read.chomp) end end -end else -flunk("cannot test in win32") + def test_win32 + flunk("cannot test in win32") + end + +end end -- cgit