diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-04 18:28:49 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-04 18:28:49 +0000 |
commit | 93b9f2cc5ef029d4cdeab7637fd419580af57d79 (patch) | |
tree | b44f957e4fd89f7f1bf2a638e6708652b2d5797b /lib/test | |
parent | 528574c2e21e25fe1f848f77f4e7606636a7a2dc (diff) | |
download | ruby-93b9f2cc5ef029d4cdeab7637fd419580af57d79.tar.gz |
* lib/test/unit.rb (Test::Unit.setup_argv): expands paths before
requiring. [ruby-dev:39012]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/test')
-rw-r--r-- | lib/test/unit.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 3e2b388273..fd7fe06f43 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -32,7 +32,7 @@ module Test end files.map! {|f| - f = f.gsub(Regexp.compile(Regexp.quote(File::ALT_SEPARATOR)), File::SEPARATOR) if File::ALT_SEPARATOR + f = f.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR if File.directory? f Dir["#{f}/**/test_*.rb"] elsif File.file? f @@ -47,12 +47,12 @@ module Test files.reject! {|f| reject_pat =~ f } files.each {|f| - d = File.dirname(File.expand_path(f)) + d = File.dirname(path = File.expand_path(f)) unless $:.include? d $: << d end begin - require f + require path rescue LoadError puts "#{f}: #{$!}" end |