mame	2008-04-17 20:13:34 +0900 (Thu, 17 Apr 2008)

  New Revision: 16059

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_rubyoptions.rb

  Log:
    * test/ruby/test_rubyoptions.rb (test_search): enable some assertions.
    
    * test/ruby/test_rubyoptions.rb: flunk message in win32.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16059&r2=16058&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_rubyoptions.rb?r1=16059&r2=16058&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16058)
+++ ChangeLog	(revision 16059)
@@ -1,3 +1,9 @@
+Thu Apr 17 20:12:47 2008  Yusuke Endoh  <mame@t...>
+
+	* test/ruby/test_rubyoptions.rb (test_search): enable some assertions.
+
+	* test/ruby/test_rubyoptions.rb: flunk message in win32.
+
 Thu Apr 17 16:07:12 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/ruby/test_rubyoptions.rb (ruby): run in C locale.
Index: test/ruby/test_rubyoptions.rb
===================================================================
--- test/ruby/test_rubyoptions.rb	(revision 16058)
+++ test/ruby/test_rubyoptions.rb	(revision 16059)
@@ -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_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 @@
     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 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/