Add --timeout

lib/grntest/test-runner.rb

@@ -16,6 +16,7 @@
 require "pathname"
 require "fileutils"
 require "tempfile"
+require "timeout"
 
 require "json"
 
@@ -135,7 +136,14 @@ def execute_groonga_script(result)
           @tester.groonga_suggest_create_dataset
         context.output_type = @tester.output_type
         run_groonga(context) do |executor|
-          executor.execute(test_script_path)
+          begin
+            Timeout.timeout(@tester.timeout) do
+              executor.execute(test_script_path)
+            end
+          rescue Timeout::Error
+            message = "# error: timeout (#{@tester.timeout}s)"
+            context.result << [:error, message, {}]
+          end
         end
         check_memory_leak(context)
         result.omitted = context.omitted?

lib/grntest/tester.rb

@@ -206,6 +206,12 @@ def create_option_parser(tester, tag)
           tester.use_color = use_color
         end
 
+        parser.on("--timeout=SECOND", Float,
+                  "Timeout for each test",
+                  "(#{tester.timeout})") do |timeout|
+          tester.timeout = timeout
+        end
+
         parser.on("--version",
                   "Show version and exit") do
           puts(VERSION)
@@ -247,6 +253,7 @@ def parse_name_or_pattern(name)
     attr_accessor :output
     attr_accessor :gdb, :default_gdb
     attr_accessor :valgrind, :default_valgrind
+    attr_accessor :timeout
     attr_writer :valgrind_gen_suppressions
     attr_writer :reporter, :keep_database, :use_color
     attr_writer :stop_on_failure
@@ -279,6 +286,7 @@ def initialize
       detect_suitable_diff
       initialize_debuggers
       initialize_memory_checkers
+      @timeout = 5
     end
 
     def run(*targets)