diff options
author | evan <evan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-20 18:30:46 +0000 |
---|---|---|
committer | evan <evan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-20 18:30:46 +0000 |
commit | bb43e6892c25570605ddb183364e5690c3b22708 (patch) | |
tree | edba6c6d5a0c02c955169b8014da33533715c54d /test | |
parent | b117475e18baa73a1787d8038693b1801dafd9f8 (diff) | |
download | ruby-bb43e6892c25570605ddb183364e5690c3b22708.tar.gz |
Pull rubygem's custom require into gem_prelude
This solves the gem loading issue by never touching $LOAD_PATH
in gem_prelude and instead loading all of rubygems more quickly.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_rubyoptions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index e41bdf2936..828a1225ab 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -323,8 +323,8 @@ class TestRubyOptions < Test::Unit::TestCase pat = Regexp.quote(notexist) bug1573 = '[ruby-core:23717]' assert_equal(false, File.exist?(notexist)) - assert_in_out_err(["-r", notexist, "-ep"], "", [], /\A-e:.* -- #{pat} \(LoadError\)\Z/, bug1573) - assert_in_out_err([notexist], "", [], /\A#{rubybin}:.* -- #{pat} \(LoadError\)\Z/, bug1573) + assert_in_out_err(["-r", notexist, "-ep"], "", [], /.* -- #{pat} \(LoadError\)/, bug1573) + assert_in_out_err([notexist], "", [], /#{rubybin}:.* -- #{pat} \(LoadError\)/, bug1573) end def test_program_name |