2 files changed, 42 insertions, 6 deletions
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index b513e44dc6..b55c391802 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -31,11 +31,5 @@ class TestGc < Test::Unit::TestCase
     }
     GC.start
     assert true   # reach here or dumps core
-    
-    if $failed > 0
-      printf "test: %d failed %d\n", $ntest, $failed
-    else
-      printf "end of test(test: %d)\n", $ntest
-    end
   end
 end
diff --git a/test/runner.rb b/test/runner.rb
new file mode 100644
index 0000000000..bae7116ea8
--- /dev/null
+++ b/test/runner.rb
@@ -0,0 +1,42 @@
+require 'test/unit/testsuite'
+require 'test/unit/testcase'
+require 'optparse'
+
+runner = 'console'
+opt = OptionParser.new
+opt.on("--runner=console", String) do |arg|
+  runner = arg
+end
+opt.parse!(ARGV)
+
+ARGV.each do |tc_name|
+  require tc_name
+end
+
+class BulkTestSuite < Test::Unit::TestSuite
+  def self.suite
+    suite = Test::Unit::TestSuite.new
+    ObjectSpace.each_object(Class) do |klass|
+      suite << klass.suite if (Test::Unit::TestCase > klass)
+    end
+    suite
+  end
+end
+
+runners_map = {
+  'console' => proc do |suite|
+    require 'test/unit/ui/console/testrunner'
+    passed = Test::Unit::UI::Console::TestRunner.run(suite).passed?
+    exit(passed ? 0 : 1)
+  end,
+  'gtk' => proc do |suite|
+    require 'test/unit/ui/gtk/testrunner'
+    Test::Unit::UI::GTK::TestRunner.run(suite)
+  end,
+  'fox' => proc do |suite|
+    require 'test/unit/ui/fox/testrunner'
+    Test::Unit::UI::Fox::TestRunner.run(suite)
+  end,
+}
+
+runners_map[runner].call(BulkTestSuite.suite)