Merge pull request #16 from ruby/update

Update

Author: hsbt

.github/workflows/test.yml

@@ -3,11 +3,19 @@ name: test
 on: [push, pull_request]
 
 jobs:
+  ruby-versions:
+    if: ${{ startsWith(github.repository, 'ruby/') || github.event_name != 'schedule' }}
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 2.3
+
   test:
+    needs: ruby-versions
     name: test (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ '3.0', 2.7, 2.6, 2.5, 2.4, head ]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:

Gemfile

@@ -7,4 +7,5 @@ group :development do
   gem "rake"
   gem "rake-compiler"
   gem "test-unit"
+  gem "test-unit-ruby-core"
 end

Rakefile

@@ -1,12 +1,14 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+require 'rake/extensiontask'
+extask = Rake::ExtensionTask.new("gdbm") do |x|
+  x.lib_dir.sub!(%r[(?=/|\z)], "/#{RUBY_VERSION}/#{x.platform}")
+end
+
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test/lib"
+  t.libs = ["lib/#{RUBY_VERSION}/#{extask.platform}", "test/lib"]
   t.test_files = FileList['test/**/test_*.rb']
 end
 
-require 'rake/extensiontask'
-Rake::ExtensionTask.new("gdbm")
-
 task :default => [:compile, :test]

test/gdbm/test_gdbm.rb

@@ -142,8 +142,9 @@ def test_s_open_with_block
     end
 
     def open_db_child(dbname, *opts)
+      libs = $".grep(%r[/gdbm\.]).map {|lib| "-I" + File.dirname(lib)}
       opts = [0644, *opts].map(&:inspect).join(', ')
-      args = [EnvUtil.rubybin, "-Ilib", "-rgdbm", "-e", <<-SRC, dbname]
+      args = [EnvUtil.rubybin, *libs, "-rgdbm", "-e", <<-SRC, dbname]
       STDOUT.sync = true
       gdbm = GDBM.open(ARGV.shift, #{opts})
       puts gdbm.class