diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-05 00:57:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-05 00:57:02 +0000 |
| commit | b83fc8735f306bccaa6b50b15fd1718698d2d630 (patch) | |
| tree | 67814f372e1322d6f3b2557d753ef9ad66e7c7f9 /test | |
| parent | fd4417f8fe0c82c7c2f9adaa556f06551d1ed111 (diff) | |
* 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/branches/ruby_1_9_2@28161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 7 |
1 files changed, 4 insertions, 3 deletions
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 |