@@ -198,7 +198,7 @@ class TestRequire < Test::Unit::TestCase def test_tainted_loadpath t = Tempfile.new(["test_ruby_test_require", ".rb"]) - abs_dir, file = File.dirname(t.path), File.basename(t.path) + abs_dir, file = File.split(t.path) abs_dir = File.expand_path(abs_dir).untaint assert_in_out_err([], <<-INPUT, %w(:ok), []) @@ -241,4 +241,22 @@ class TestRequire < Test::Unit::TestCase p :ok INPUT end + + def test_relative + require 'tmpdir' + Dir.mktmpdir do |tmp| + Dir.chdir(tmp) do + Dir.mkdir('x') + File.open('x/t.rb', 'wb') {} + File.open('x/a.rb', 'wb') {|f| f.puts("require_relative('t.rb')")} + assert require('./x/t.rb') + assert !require(File.expand_path('x/t.rb')) + assert_nothing_raised(LoadError) {require('./x/a.rb')} + assert_raise(LoadError) {require('x/t.rb')} + File.unlink(*Dir.glob('x/*')) + Dir.rmdir("#{tmp}/x") + assert(!require('tmpdir')) + end + end + end end test/ruby/test_require.rb @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 318 +#define RUBY_PATCHLEVEL 319 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 version.h 6374acf0c2a2ae684c9b9cac7c7617cb138169fd Yuki Sonoda (Yugui) yugui@yugui.jp http://github.com/yugui/ruby/commit/d44cbebb464074f41d6bd7f46db320010aa3a4b1 d44cbebb464074f41d6bd7f46db320010aa3a4b1 2009-10-31T04:28:29-07:00 2009-10-31T04:28:29-07:00 merges r24818 from trunk into ruby_1_9_1. -- * test/ruby/test_require.rb (test_relative): tests for require_relative. f33a3a20ea5c77a8f50804d8ef55bdb6ab491588 Yuki Sonoda (Yugui) yugui@yugui.jp