aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-05 03:16:19 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-05 03:16:19 +0000
commit738fee09de8034da66754fc7cc0e8044f5e1069f (patch)
tree507cd079688c4e946eedc957f06af1e3904dd87a
parent9d93d4df6f22fba2c2d48cbdf594fcad3682fed3 (diff)
downloadruby-738fee09de8034da66754fc7cc0e8044f5e1069f.tar.gz
* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_notfound): after
r41710, the path of command uses backslash as the separator on Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_rubyoptions.rb1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fb81640f1..ac6f50a694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 5 12:14:40 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_notfound): after
+ r41710, the path of command uses backslash as the separator on
+ Windows.
+
Fri Jul 5 11:29:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/assertions.rb (assert_raise_with_message): move from
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 486b68654d..9db834b30d 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -414,6 +414,7 @@ class TestRubyOptions < Test::Unit::TestCase
bug1573 = '[ruby-core:23717]'
assert_file.not_exist?(notexist)
assert_in_out_err(["-r", notexist, "-ep"], "", [], /.* -- #{pat} \(LoadError\)/, bug1573)
+ rubybin.gsub!(%r(/), '\\') if /mswin|mingw/ =~ RUBY_PLATFORM
assert_in_out_err([notexist], "", [], /#{rubybin}:.* -- #{pat} \(LoadError\)/, bug1573)
end