grntest 1.5.6 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc70a0713dc6900659018742093257e50ab5569b05e603934d3554939fd0c246
-  data.tar.gz: 953a77a00a938f5126cc925228195b3dfad9bffc08e2aec83f168acb316cb9c6
+  metadata.gz: 2209e3afe2a2ef0d25a9ad8e61e0ef36fad7b9faa7106b20d00511ad6f767a9e
+  data.tar.gz: dfe1b6a22dbae8d02ada396dc237e20f7384e94a52b5c37e35d8c2dbd01a90df
 SHA512:
-  metadata.gz: 5cc8ec7a63366dd1f0af5e5b414a2f5dd270225eb31905e43712a5c73d049a31b7ecb7e5ed4d61ef124659e660c59c4ae99988b39b5fa5c40b4d8b6fe01db7fe
-  data.tar.gz: e8ff6acc4e760082c9511a7445baa9662057d12d1cb046b60eafe53277e6310b832198767cbeabd582db6b20fb34bdd9c7e838ccdfc5f9dbf459a138fcd7feef
+  metadata.gz: 9e84e6673963cb2bf2de0cb5cbd21a9d64977924716c37102aea48415aab1ffcbfdde2f630030f3179828c9e0855da124ca226523c0a060dd92cfd04bb6880e1
+  data.tar.gz: 6f2c4f6730b26200e5fa8d39cb56d550dbe98407e5eb54f824e99f0dac9a84616da12fb1f4a32e799344d443d91fd297128e979a8c1caafa96d85a15fb7444ce

data/doc/text/news.md

@@ -1,5 +1,26 @@
 # News
 
+## 1.5.8: 2023-07-21
+
+### Improvements
+
+  * `--random-seed`: Added.
+
+  * xml: Accepted negative elapsed time.
+
+  * Added support for groonga-nginx.
+
+## 1.5.7: 2023-03-08
+
+### Improvements
+
+  * Added support for `rr`.
+
+  * Improved backtrace normalization on macOS.
+
+  * Added `add-substitution` and `remove-substitution` to unify common
+    tests for `NormalizerNFKC*`.
+
 ## 1.5.6: 2022-03-16
 
 ### Improvements

data/lib/grntest/executors/base-executor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,6 +47,7 @@ module Grntest
         @sleep_after_command = nil
         @raw_status_response = nil
         @features = nil
+        @substitutions = {}
       end
 
       def execute(script_path)
@@ -59,6 +60,7 @@ module Grntest
             parser = create_parser
             script_file.each_line do |line|
               begin
+                line = substitute_input(line)
                 parser << line
               rescue Error, Groonga::Command::Parser::Error
                 line_info = "#{script_path}:#{script_file.lineno}:#{line.chomp}"
@@ -319,7 +321,7 @@ module Grntest
               record << ","
             end
             record << "\n"
-            record << evaluator.evaluate(i).to_json
+            record << evaluator.evaluate(i: i).to_json
             before = Time.now
             parser << record
             elapsed = Time.now - before
@@ -479,6 +481,45 @@ module Grntest
         end
       end
 
+      def substitute_input(input)
+        return input if @substitutions.empty?
+        @substitutions.each_value do |pattern, substituted_evaluator, _|
+          input = input.gsub(pattern) do
+            substituted_evaluator.evaluate(match_data: Regexp.last_match)
+          end
+        end
+        input
+      end
+
+      def normalize_input(input)
+        return input if @substitutions.empty?
+        @substitutions.each_value do |pattern, _, normalized_evaluator|
+          input = input.gsub(pattern) do
+            normalized_evaluator.evaluate(match_data: Regexp.last_match)
+          end
+        end
+        input
+      end
+
+      def execute_directive_add_substitution(line, content, options)
+        _, pattern, rest = content.split(" ", 3)
+        substituted, normalized = Shellwords.shellsplit(rest)
+        substituted.force_encoding("UTF-8")
+        normalized.force_encoding("UTF-8")
+        substituted_evaluator = TemplateEvaluator.new("\"#{substituted}\"")
+        normalized_evaluator = TemplateEvaluator.new("\"#{normalized}\"")
+        @substitutions[pattern] = [
+          compile_pattern(pattern),
+          substituted_evaluator,
+          normalized_evaluator,
+        ]
+      end
+
+      def execute_directive_remove_substitution(line, content, options)
+        pattern = content.split(" ", 2)[1]
+        @substitutions.delete(pattern)
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -534,6 +575,10 @@ module Grntest
           execute_directive_require_feature(line, content, options)
         when "synonym-generate"
           execute_directive_synonym_generate(parser, line, content, options)
+        when "add-substitution"
+          execute_directive_add_substitution(line, content, options)
+        when "remove-substitution"
+          execute_directive_remove_substitution(line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -722,7 +767,7 @@ module Grntest
           true
         when /\A[\w.\\-]+:\d+:\d+: /
           true
-        when /\A(?:groonga|groonga-httpd)
+        when /\A(?:groonga|groonga-httpd|nginx)
                 \((?:\+0x\h+|\w+\+0x\h+)?\)
                 \s
                 \[0x\h+\]\z/x
@@ -731,7 +776,7 @@ module Grntest
           # groonga-httpd(+0xbd1aa) [0x564caf2bfc12]
           # groonga-httpd(ngx_http_core_run_phases+0x25) [0x564caf2bfc12]
           true
-        when /\A\d+\s+(?:lib\S+\.dylib|\S+\.so|groonga|nginx|\?\?\?)\s+
+        when /\A\d+\s+(?:lib\S+\.dylib|\S+\.so|groonga|nginx|\?\?\?|dyld)\s+
                 0x[\da-f]+\s
                 \S+\s\+\s\d+\z/x
           true
@@ -780,6 +825,7 @@ module Grntest
       end
 
       def log_input(content)
+        content = normalize_input(content)
         log(:input, content)
       end
 

data/lib/grntest/template-evaluator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,8 +19,12 @@ module Grntest
       @template = template
     end
 
-    def evaluate(i)
-      eval(@template)
+    def evaluate(**local_variables)
+      _binding = binding
+      local_variables.each do |name, value|
+        _binding.local_variable_set(name, value)
+      end
+      _binding.eval(@template)
     end
   end
 end

data/lib/grntest/test-runner.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2022  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -272,6 +272,13 @@ call (int)chdir("#{context.temporary_directory_path}")
         command_line << "--command=#{gdb_command_path}"
         command_line << "--quiet"
         command_line << "--args"
+      elsif @tester.rr
+        if libtool_wrapper?(command)
+          command_line << find_libtool(command)
+          command_line << "--mode=execute"
+        end
+        command_line << @tester.rr
+        command_line << "record"
       elsif @tester.valgrind
         if libtool_wrapper?(command)
           command_line << find_libtool(command)
@@ -493,10 +500,13 @@ call (int)chdir("#{context.temporary_directory_path}")
           "-s",
           context.relative_db_path.to_s,
         ]
-      when "groonga-httpd"
-        command_line = command_command_line(@tester.groonga_httpd, context,
+      when "groonga-httpd", "groonga-nginx"
+        command_line = command_command_line(@tester.groonga_httpd,
+                                            context,
                                             spawn_options)
-        config_file_path = create_config_file(context, host, port,
+        config_file_path = create_config_file(context,
+                                              host,
+                                              port,
                                               pid_file_path)
         command_line += [
           "-c", config_file_path.to_s,
@@ -510,6 +520,11 @@ call (int)chdir("#{context.temporary_directory_path}")
       config_file_path =
         context.temporary_directory_path + "groonga-httpd.conf"
       config_file_path.open("w") do |config_file|
+        if @tester.ngx_http_groonga_module_so
+          config_file.puts(<<-LOAD_MODULE)
+load_module #{@tester.ngx_http_groonga_module_so};
+          LOAD_MODULE
+        end
         config_file.puts(<<-GLOBAL)
 daemon off;
 master_process off;
@@ -718,7 +733,7 @@ http {
 
     def normalize_output_xml(content, options)
       content.sub(/^<RESULT .+?>/) do |result|
-        result.gsub(/( (?:UP|ELAPSED))="\d+\.\d+(?:e[+-]?\d+)?"/, '\1="0.0"')
+        result.gsub(/( (?:UP|ELAPSED))="-?\d+\.\d+(?:e[+-]?\d+)?"/, '\1="0.0"')
       end
     end
 

data/lib/grntest/tester.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@ module Grntest
         parser = OptionParser.new
         parser.banner += " TEST_FILE_OR_DIRECTORY..."
 
+        custom_groonga_httpd = false
         parser.on("--groonga=COMMAND",
                   "Use COMMAND as groonga command",
                   "(#{tester.groonga})") do |command|
@@ -48,6 +49,13 @@ module Grntest
                   "Use COMMAND as groonga-httpd command for groonga-httpd tests",
                   "(#{tester.groonga_httpd})") do |command|
           tester.groonga_httpd = normalize_command(command)
+          custom_groonga_httpd = true
+        end
+
+        parser.on("--ngx-http-groonga-module-so=PATH",
+                  "Use PATH as ngx_http_groonga_module.so for groonga-nginx tests",
+                  "(#{tester.ngx_http_groonga_module_so})") do |path|
+          tester.ngx_http_groonga_module_so = path
         end
 
         parser.on("--groonga-suggest-create-dataset=COMMAND",
@@ -101,15 +109,19 @@ module Grntest
           tester.output_type = type
         end
 
-        available_testees = ["groonga", "groonga-httpd"]
+        available_testees = ["groonga", "groonga-httpd", "groonga-nginx"]
         available_testee_labels = available_testees.join(", ")
         parser.on("--testee=TESTEE", available_testees,
                   "Test against TESTEE",
                   "[#{available_testee_labels}]",
                   "(#{tester.testee})") do |testee|
           tester.testee = testee
-          if tester.testee == "groonga-httpd"
+          case tester.testee
+          when "groonga-httpd"
             tester.interface = "http"
+          when "groonga-nginx"
+            tester.interface = "http"
+            tester.groonga_httpd = "nginx" unless custom_groonga_httpd
           end
         end
 
@@ -197,6 +209,12 @@ module Grntest
           tester.gdb = command || tester.default_gdb
         end
 
+        parser.on("--rr[=COMMAND]",
+                  "Run Groonga on 'rr record' and use COMMAND as rr",
+                  "(#{tester.default_rr})") do |command|
+          tester.rr = command || tester.default_rr
+        end
+
         parser.on("--valgrind[=COMMAND]",
                   "Run Groonga on valgrind and use COMMAND as valgrind",
                   "(#{tester.default_valgrind})") do |command|
@@ -275,6 +293,11 @@ module Grntest
           tester.shutdown_wait_timeout = timeout
         end
 
+        parser.on("--random-seed=SEED", Integer,
+                  "Seed for random numbers") do |seed|
+          srand(seed)
+        end
+
         parser.on("--version",
                   "Show version and exit") do
           puts(VERSION)
@@ -311,6 +334,7 @@ module Grntest
 
     attr_accessor :groonga
     attr_accessor :groonga_httpd
+    attr_accessor :ngx_http_groonga_module_so
     attr_accessor :groonga_suggest_create_dataset
     attr_accessor :groonga_synonym_generate
     attr_accessor :interface
@@ -323,6 +347,7 @@ module Grntest
     attr_accessor :n_workers
     attr_accessor :output
     attr_accessor :gdb, :default_gdb
+    attr_accessor :rr, :default_rr
     attr_accessor :valgrind, :default_valgrind
     attr_accessor :timeout
     attr_accessor :read_timeout
@@ -339,6 +364,7 @@ module Grntest
     def initialize
       @groonga = "groonga"
       @groonga_httpd = "groonga-httpd"
+      @ngx_http_groonga_module_so = nil
       @groonga_suggest_create_dataset = "groonga-suggest-create-dataset"
       unless command_exist?(@groonga_suggest_create_dataset)
         @groonga_suggest_create_dataset = nil
@@ -534,6 +560,8 @@ module Grntest
     def initialize_debuggers
       @gdb = nil
       @default_gdb = "gdb"
+      @rr = nil
+      @default_rr = "rr"
     end
 
     def initialize_memory_checkers

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.5.6"
+  VERSION = "1.5.8"
 end

data/lib/grntest/worker.rb

@@ -93,31 +93,29 @@ module Grntest
 
       @result.measure do
         @reporter.on_worker_start(self)
-        catch do |tag|
-          loop do
-            suite_name, test_script_path, test_name = queue.pop
-            break if test_script_path.nil?
-
-            unless @suite_name == suite_name
-              @reporter.on_suite_finish(self) if @suite_name
-              @suite_name = suite_name
-              @reporter.on_suite_start(self)
-            end
-
-            unless run_test(test_script_path, test_name)
-              succeeded = false
-            end
-
-            break if interruptted?
-
-            if @tester.stop_on_failure? and @test_suites_result.have_failure?
-              break
-            end
+        loop do
+          suite_name, test_script_path, test_name = queue.pop
+          break if test_script_path.nil?
+
+          unless @suite_name == suite_name
+            @reporter.on_suite_finish(self) if @suite_name
+            @suite_name = suite_name
+            @reporter.on_suite_start(self)
+          end
+
+          unless run_test(test_script_path, test_name)
+            succeeded = false
+          end
+
+          break if interruptted?
+
+          if @tester.stop_on_failure? and @test_suites_result.have_failure?
+            break
           end
-          @status = "finished"
-          @reporter.on_suite_finish(@suite_name) if @suite_name
-          @suite_name = nil
         end
+        @status = "finished"
+        @reporter.on_suite_finish(@suite_name) if @suite_name
+        @suite_name = nil
       end
       @reporter.on_worker_finish(self)
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.8
 platform: ruby
 authors:
 - Kouhei Sutou
 - Haruka Yoshihara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -269,7 +269,7 @@ homepage: https://github.com/groonga/grntest
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -284,8 +284,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key: 
+rubygems_version: 3.5.0.dev
+signing_key:
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga
   by writing Groonga commands and expected result.