grntest 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7713d127d2264d3f7a6f36b79098ca244199979e
-  data.tar.gz: 70949fc8571486a393363cb60ff427a1f7846cd3
+  metadata.gz: 5aee9882d86b34a5b1784921890c57144b581daa
+  data.tar.gz: 07030943c58f7d7d76d0713d555c536dda782961
 SHA512:
-  metadata.gz: e69d872e3a661ff0fb5001a72d3e786e1afa7d16d74c57dadeb33e44892cdde3f8b216c011fdda2f2ae3415af0f364c0c1092206c3f9f263774e58930a57a44c
-  data.tar.gz: ff16fa168781e0af31ce27d6ab73e306f12465ce91a6d4f324ddbcabccab17ce4c6632c8a2e6bbf7677a1cdc85b1b8b3740d4a01728484207c5c4cba6938e840
+  metadata.gz: f6dc4dc972ad6a914839427cb165e4a08c76a9ee3ee63d25d89a680d74fcd41fc665f487851d9b94e24c534246299bb551bcb4d24cd1478e72d4c72eb79d10ed
+  data.tar.gz: 4e90459f4b0b42412cb9d2215225ea42d9899388ed797182627881a52275b5e5fa70fb3d4c41d92045ace87d1f2b953ad8f12dc5a0b5c6207697137c9c094172

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.1.6: 2016-04-27
+
+### Improvements
+
+  * Added `--timeout` option.
+
 ## 1.1.5: 2016-04-26
 
 ### Fixes

data/lib/grntest/test-runner.rb

@@ -16,6 +16,7 @@
 require "pathname"
 require "fileutils"
 require "tempfile"
+require "timeout"
 
 require "json"
 
@@ -135,7 +136,14 @@ module Grntest
           @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?

data/lib/grntest/tester.rb

@@ -206,6 +206,12 @@ module Grntest
           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 @@ module Grntest
     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 @@ module Grntest
       detect_suitable_diff
       initialize_debuggers
       initialize_memory_checkers
+      @timeout = 5
     end
 
     def run(*targets)

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json