diff options
| author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-15 04:16:28 +0000 |
|---|---|---|
| committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-15 04:16:28 +0000 |
| commit | 4c5e88e1827187b5aae7607ab2073ef68a37fbcb (patch) | |
| tree | 5ffea3d1286c9ecc9c9a519c931e0d3aef61a42c /test | |
| parent | af21801c04b74c3dbb5c953f02882e2407d6025f (diff) | |
| download | ruby-4c5e88e1827187b5aae7607ab2073ef68a37fbcb.tar.gz ruby-4c5e88e1827187b5aae7607ab2073ef68a37fbcb.tar.xz ruby-4c5e88e1827187b5aae7607ab2073ef68a37fbcb.zip | |
Disable minitest autorunner and run manually in order to get test/unit fork/signal tests to not trigger minitest multiple times
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/runner.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/test/runner.rb b/test/runner.rb index f9ed25a93..aa78c4ead 100644 --- a/test/runner.rb +++ b/test/runner.rb @@ -6,4 +6,14 @@ rcsid = %w$Id$ Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze Release = rcsid[3].freeze -exit Test::Unit::AutoRunner.run(true, File.dirname($0)) +# this allows minitest and test/unit to run side by side. test/unit +# tests with fork/signal were triggering minitest multiple times. +require 'minitest/unit' +MiniTest::Unit.disable_autorun + +args = ARGV.dup +result = Test::Unit::AutoRunner.run(true, File.dirname($0)) +result &&= MiniTest::Unit.new.run(args) + +exit result + |