From 2ef85089eca4a634a5619bc37084d276053f98ea Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 5 Jun 2010 00:57:02 +0000 Subject: * ruby.c (process_options): revert r25330, so that $0 can be seen from required libraries by -r option. [ruby-core:23717] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_rubyoptions.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 7b956810a1..dcdfd85fea 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -319,10 +319,11 @@ class TestRubyOptions < Test::Unit::TestCase def test_notfound notexist = "./notexist.rb" rubybin = Regexp.quote(EnvUtil.rubybin) - pat = /\A#{rubybin}:.* -- #{Regexp.quote(notexist)} \(LoadError\)\Z/ + pat = Regexp.quote(notexist) + bug1573 = '[ruby-core:23717]' assert_equal(false, File.exist?(notexist)) - assert_in_out_err(["-r", notexist, "-ep"], "", [], pat) - assert_in_out_err([notexist], "", [], pat) + assert_in_out_err(["-r", notexist, "-ep"], "", [], /\A-e:.* -- #{pat} \(LoadError\)\Z/, bug1573) + assert_in_out_err([notexist], "", [], /\A#{pat}:.* -- #{pat} \(LoadError\)\Z/, bug1573) end def test_program_name -- cgit v1.2.3