* 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

4 files changed, 16 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 278426b33b..abaafbb315 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed May 21 01:45:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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.
+
 Wed May 21 01:28:47 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* transcode.c, include/ruby/encodng.h (rb_str_transcode):
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index bc9a2fa0a5..bfecb60084 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -34,11 +34,6 @@ module EnvUtil
 
   LANG_ENVS = %w"LANG LC_ALL LC_CTYPE"
   def rubyexec(*args)
-    if /(mswin|bccwin|mingw|emx)/ =~ RUBY_PLATFORM
-      flunk("cannot test in win32")
-      return
-    end
-
     ruby = EnvUtil.rubybin
     c = "C"
     env = {}
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 274f7bf058..24072472e5 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -20,7 +20,7 @@ class TestFileExhaustive < Test::Unit::TestCase
     end
     begin
       File.link(@file, @hardlinkfile)
-    rescue NotImplementedError
+    rescue NotImplementedError, Errno::EINVAL	# EINVAL for Windows Vista
       @hardlinkfile = nil
     end
   end
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index d90fa06fb3..6e96281bb8 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -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