diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-29 15:14:57 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-29 15:14:57 +0000 |
| commit | 2435ab175ffa9a270b2992c69f91c261e08f83a0 (patch) | |
| tree | da49b1d559734fc344e826ed522131c23ee7e17d /test | |
| parent | 14a56523d8f8f271210e573c6be4a22acda31773 (diff) | |
merges r28693, r28695 and r28703 from trunk into ruby_1_9_2.
--
* lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from
from gems properly.
* lib/rubygems.rb: Load the custom require if --disable-rubygems
was used.
* gem_prelude.rb: Pull in rubygem's custom require
[ruby-core:30846]
* lib/rubygems.rb: Handle always having custom require available
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28786 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 8a4533ef44..f572ab7083 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -322,8 +322,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 |