diff options
| author | ntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-17 04:50:49 +0000 |
|---|---|---|
| committer | ntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-17 04:50:49 +0000 |
| commit | f2d29b01cb8d47b9689af62ec4d67059277580d9 (patch) | |
| tree | d44099bb6e6c1dc0cbb438e7f1f542e37860ae86 /lib/test/unit/collector | |
| parent | 966332ebed8ae32009e7f54ffcfe6bbaada8080a (diff) | |
* lib/test/unit/collector.rb (collect_file): now deletes paths added
to $LOAD_PATH instead of restoring it verbatim.
* lib/test/unit/autorunner.rb (AutoRunner.run): fixed so that
'ruby -rtest/unit -rtest1 -rtest2 -e0' will use the objectspace
collector again. Also tried to simplify the calling convention.
* test/runner.rb: adjusted for new AutoRunner semantics.
* lib/test/unit.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/test/unit/collector')
| -rw-r--r-- | lib/test/unit/collector/dir.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb index 9342fdecbc..1395cdf4e5 100644 --- a/lib/test/unit/collector/dir.rb +++ b/lib/test/unit/collector/dir.rb @@ -75,9 +75,8 @@ module Test end def collect_file(name, suites, already_gathered) - loadpath = $:.dup dir = File.dirname(File.expand_path(name)) - $:.unshift(dir) unless $:.first == dir + $:.unshift(dir) if(@req) @req.require(name) else @@ -85,7 +84,7 @@ module Test end find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)} ensure - $:.replace(loadpath) + $:.delete_at($:.rindex(dir)) if(dir) end end end |