1 files changed, 8 insertions, 1 deletions
diff --git a/test/runner.rb b/test/runner.rb
index b02e2e0681..5fbbd95fab 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -46,8 +46,15 @@ rescue OptionParser::ParseError
 end
 
 if argv.empty?
-  argv = Dir.glob(File.join(File.dirname(__FILE__), "**", "test_*.rb")).sort
+  argv = [File.dirname(__FILE__)]
 end
+argv.collect! do |arg|
+  if File.directory?(arg)
+    Dir.glob(File.join(arg, "**", "test_*.rb")).sort
+  else
+    arg
+  end
+end.flatten!
 
 argv.each do |tc_name|
   require tc_name