Reduced gem_prelude to just require rubygems. Reviewed by Evan Phoenix

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ryan 2011-01-14 02:02:12 +00:00
parent 8409156e24
commit f52c2cc24d
10 changed files with 40 additions and 277 deletions

View file

@ -1210,8 +1210,8 @@ class TestProcess < Test::Unit::TestCase
Dir.chdir("vd") {
dir = "#{d}/vd"
# OpenSolaris cannot remove the current directory.
system(RUBY, "-e", "Dir.chdir '..'; Dir.rmdir #{dir.dump}")
system({"RUBYLIB"=>nil}, RUBY, "-e", "exit true")
system(RUBY, "--disable-gems", "-e", "Dir.chdir '..'; Dir.rmdir #{dir.dump}")
system({"RUBYLIB"=>nil}, RUBY, "--disable-gems", "-e", "exit true")
status = $?
}
assert(status.success?, "[ruby-dev:38105]")

View file

@ -57,13 +57,14 @@ class TestRubyOptions < Test::Unit::TestCase
end
def test_debug
assert_in_out_err(%w(-de) + ["p $DEBUG"], "", %w(true), [])
assert_in_out_err(["--disable-gems", "-de", "p $DEBUG"], "", %w(true), [])
assert_in_out_err(%w(--debug -e) + ["p $DEBUG"], "", %w(true), [])
assert_in_out_err(["--disable-gems", "--debug", "-e", "p $DEBUG"],
"", %w(true), [])
end
def test_verbose
assert_in_out_err(%w(-vve) + [""]) do |r, e|
assert_in_out_err(["-vve", ""]) do |r, e|
assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join)
assert_equal RUBY_DESCRIPTION, r.join.chomp
assert_equal([], e)
@ -209,10 +210,10 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err([], "", [], /invalid switch in RUBYOPT: -e \(RuntimeError\)/)
ENV['RUBYOPT'] = '-T1'
assert_in_out_err([], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/)
assert_in_out_err(["--disable-gems"], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/)
ENV['RUBYOPT'] = '-T4'
assert_in_out_err([], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/)
assert_in_out_err(["--disable-gems"], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/)
ENV['RUBYOPT'] = '-Eus-ascii -KN'
assert_in_out_err(%w(-Eutf-8 -KU), "p '\u3042'") do |r, e|

View file

@ -271,7 +271,7 @@ class TestThread < Test::Unit::TestCase
end
INPUT
assert_in_out_err(%w(-d), <<-INPUT, %w(false 2), /.+/)
assert_in_out_err(%w(--disable-gems -d), <<-INPUT, %w(false 2), /.+/)
p Thread.abort_on_exception
begin
Thread.new { raise }