diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | test/ruby/test_require.rb | 7 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 4 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,12 @@ +Fri Jun 26 17:33:46 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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. + Fri Jun 26 16:32:59 2009 NAKAMURA Usaku <usa@ruby-lang.org> * common.mk (COMPILE_PRELUDE): need -I. before -rrbconfig. diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 4bc44eff04..a1726bf63b 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 909c8f469e..59be99164a 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\)/) |