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 | |
parent | 966332ebed8ae32009e7f54ffcfe6bbaada8080a (diff) | |
download | ruby-f2d29b01cb8d47b9689af62ec4d67059277580d9.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | lib/test/unit.rb | 2 | ||||
-rw-r--r-- | lib/test/unit/autorunner.rb | 20 | ||||
-rw-r--r-- | lib/test/unit/collector/dir.rb | 5 | ||||
-rw-r--r-- | test/runner.rb | 2 |
5 files changed, 29 insertions, 12 deletions
@@ -1,3 +1,15 @@ +Thu Feb 17 13:46:00 2005 Nathaniel Talbott <ntalbott@ruby-lang.org> + * 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. + Thu Feb 17 00:31:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * test/drb/test_drb.rb, ut_safe1.rb: port from 1.8 diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 84f221fe96..7c1e2c064b 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -273,6 +273,6 @@ end at_exit do unless $! || Test::Unit.run? - exit Test::Unit::AutoRunner.run($0 != "-e" && $0) + exit Test::Unit::AutoRunner.run end end diff --git a/lib/test/unit/autorunner.rb b/lib/test/unit/autorunner.rb index 38b0b76ef3..2831293b7c 100644 --- a/lib/test/unit/autorunner.rb +++ b/lib/test/unit/autorunner.rb @@ -5,14 +5,20 @@ require 'optparse' module Test module Unit class AutoRunner - def self.run(current_file=nil, default_dir=nil, argv=ARGV, &block) - if(!current_file || current_file == $0) - r = new(!current_file, &block) - if !r.process_args(argv) && default_dir - r.to_run << default_dir - end - r.run + def self.run(force_standalone=false, default_dir=nil, argv=ARGV, &block) + r = new(force_standalone || standalone?, &block) + if((!r.process_args(argv)) && default_dir) + r.to_run << default_dir + end + r.run + end + + def self.standalone? + return false unless("-e" == $0) + ObjectSpace.each_object(Class) do |klass| + return false if(klass < TestCase) end + true end RUNNERS = { 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 diff --git a/test/runner.rb b/test/runner.rb index 19c3b9b376..f9ed25a931 100644 --- a/test/runner.rb +++ b/test/runner.rb @@ -6,4 +6,4 @@ rcsid = %w$Id$ Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze Release = rcsid[3].freeze -exit Test::Unit::AutoRunner.run(false, File.dirname($0)) +exit Test::Unit::AutoRunner.run(true, File.dirname($0)) |