Kouhei Sutou
null+****@clear*****
Tue Mar 21 19:55:27 JST 2017
Kouhei Sutou 2017-03-21 19:55:27 +0900 (Tue, 21 Mar 2017) New Revision: 847ddae2896be59a3f7f1b5dd1c5778842f90a5b https://github.com/groonga/grntest/commit/847ddae2896be59a3f7f1b5dd1c5778842f90a5b Message: Add --no-suppress-backtrace option It shows full backtrace for debug. Modified files: lib/grntest/execution-context.rb lib/grntest/executors/base-executor.rb lib/grntest/test-runner.rb lib/grntest/tester.rb Modified: lib/grntest/execution-context.rb (+6 -0) =================================================================== --- lib/grntest/execution-context.rb 2017-02-05 10:37:10 +0900 (6061e54) +++ lib/grntest/execution-context.rb 2017-03-21 19:55:27 +0900 (5adb1e3) @@ -24,6 +24,7 @@ module Grntest attr_accessor :abort_tag attr_accessor :timeout attr_accessor :default_timeout + attr_writer :suppress_backtrace attr_writer :collect_query_log attr_writer :debug def initialize @@ -42,6 +43,7 @@ module Grntest @timeout = 0 @default_timeout = 0 @omitted = false + @suppress_backtrace = true @collect_query_log = false @debug = false end @@ -50,6 +52,10 @@ module Grntest @logging end + def suppress_backtrace? + @suppress_backtrace or debug? + end + def collect_query_log? @collect_query_log end Modified: lib/grntest/executors/base-executor.rb (+3 -1) =================================================================== --- lib/grntest/executors/base-executor.rb 2017-02-05 10:37:10 +0900 (498b218) +++ lib/grntest/executors/base-executor.rb 2017-03-21 19:55:27 +0900 (1c84e5b) @@ -430,7 +430,9 @@ module Grntest parser = LogParser.new parser.parse(log) do |entry| next unless important_log_level?(entry.log_level) - next if backtrace_log_message?(entry.message) + if****@conte*****_backtrace? + next if backtrace_log_message?(entry.message) + end next if thread_log_message?(entry.message) important_messages << "\#|#{entry.log_level}| #{entry.message}" end Modified: lib/grntest/test-runner.rb (+1 -0) =================================================================== --- lib/grntest/test-runner.rb 2017-02-05 10:37:10 +0900 (466918d) +++ lib/grntest/test-runner.rb 2017-03-21 19:55:27 +0900 (6565331) @@ -141,6 +141,7 @@ module Grntest context.timeout =****@teste***** context.timeout = 0 if****@teste***** context.default_timeout = context.timeout + context.suppress_backtrace =****@teste*****_backtrace? context.debug =****@teste*****? run_groonga(context) do |executor| executor.execute(test_script_path) Modified: lib/grntest/tester.rb (+12 -0) =================================================================== --- lib/grntest/tester.rb 2017-02-05 10:37:10 +0900 (5e6e6cd) +++ lib/grntest/tester.rb 2017-03-21 19:55:27 +0900 (8946493) @@ -194,6 +194,12 @@ module Grntest tester.suppress_omit_log = boolean end + parser.on("--no-suppress-backtrace", + "Suppress backtrace", + "(#{tester.suppress_backtrace?})") do |boolean| + tester.suppress_backtrace = boolean + end + parser.on("--output=OUTPUT", "Output to OUTPUT", "(stdout)") do |output| @@ -264,6 +270,7 @@ module Grntest attr_writer :reporter, :keep_database, :use_color attr_writer :stop_on_failure attr_writer :suppress_omit_log + attr_writer :suppress_backtrace attr_writer :debug attr_reader :test_patterns, :test_suite_patterns attr_reader :exclude_test_patterns, :exclude_test_suite_patterns @@ -286,6 +293,7 @@ module Grntest @use_color = nil @stop_on_failure = false @suppress_omit_log = true + @suppress_backtrace = true @debug = false @test_patterns = [] @test_suite_patterns = [] @@ -336,6 +344,10 @@ module Grntest @suppress_omit_log end + def suppress_backtrace? + @suppress_backtrace + end + def debug? @debug end -------------- next part -------------- HTML����������������������������...Download