aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test/unit/collector/dir.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-24 05:08:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-24 05:08:04 +0000
commit73d77c8f572b760b4c868579188fc39f360151cb (patch)
tree3b5013c7ceed366ab596efd596feb3831f5fc02f /lib/test/unit/collector/dir.rb
parentd05b3b1e4801903a3f6338af932be334049de1ed (diff)
downloadruby-73d77c8f572b760b4c868579188fc39f360151cb.tar.gz
* lib/test/unit/assertions.rb: Modules are allowed to rescue.
* lib/test/unit/autorunner.rb: show output_level in order. * lib/test/unit/collector/dir.rb: get rid of successive same directories in load path. * test/testunit/test_assertions.rb (test_assert_nothing_raised, test_assert_raise): test for modules. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/test/unit/collector/dir.rb')
-rw-r--r--lib/test/unit/collector/dir.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index c4a4c16dfd..43fd1be718 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -68,7 +68,8 @@ module Test
def collect_file(name, suites, already_gathered)
loadpath = $:.dup
- $:.unshift(File.dirname(name))
+ dir = File.dirname(File.expand_path(name))
+ $:.unshift(dir) unless $:.first == dir
if(@req)
@req.require(name)
else