From 738fee09de8034da66754fc7cc0e8044f5e1069f Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 5 Jul 2013 03:16:19 +0000 Subject: * 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 --- ChangeLog | 6 ++++++ test/ruby/test_rubyoptions.rb | 1 + 2 files changed, 7 insertions(+) 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 + + * 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 * 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 -- cgit v1.2.3