From 69be7e91b87ae921955be7bbb0edf9c821342447 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 26 Jun 2009 12:48:15 +0000
Subject: * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_rubyopt):  
 test suite add '.' to RUBYLIB.  remove checks.

* test/ruby/test_require.rb (TestRequire#test_tainted_loadpath):
  the default tempdir directory /tmp is world writable, so
  SecrurityError would be raised.  check removed.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_require.rb     | 7 +++++--
 test/ruby/test_rubyoptions.rb | 4 ----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 4bc44eff0..a1726bf63 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -230,8 +230,11 @@ class TestRequire < Test::Unit::TestCase
       abs_dir = "#{ abs_dir }"
       $: << abs_dir.taint
       $SAFE = 1
-      require "#{ t.path }"
-      p :ok
+      begin
+        require "#{ file }"
+      rescue SecurityError
+        p :ok
+      end
     INPUT
 
     assert_in_out_err([], <<-INPUT, %w(:ok), [])
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 909c8f469..59be99164 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -199,16 +199,12 @@ class TestRubyOptions < Test::Unit::TestCase
     ENV['RUBYOPT'] = ' - -'
     assert_in_out_err([], "", [], [])
 
-    assert_in_out_err(['-e', 'p $:.include?(".")'], "", ["false"], [])
-
     ENV['RUBYOPT'] = '-e "p 1"'
     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(['-e', 'p $:.include?(".")'], "", ["false"], [])
-
     ENV['RUBYOPT'] = '-T4'
     assert_in_out_err([], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/)
 
-- 
cgit