ZJIT: Test against bundled gems on CI

Author: st0012

.github/workflows/zjit-macos.yml

@@ -101,9 +101,6 @@ jobs:
       - name: Run configure
         run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
 
-      - run: make prepare-gems
-        if: ${{ matrix.test_task == 'test-bundled-gems' }}
-
       - run: make
 
       - name: Verify that --zjit-dump-disasm works

.github/workflows/zjit-ubuntu.yml

@@ -72,6 +72,10 @@ jobs:
             configure: '--enable-zjit=dev --with-gcc=clang-14'
             libclang_path: '/usr/lib/llvm-14/lib/libclang.so.1'
 
+          - test_task: 'test-bundled-gems'
+            configure: '--enable-zjit=dev'
+            run_opts: '--zjit-call-threshold=1'
+
     env:
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
       RUN_OPTS: ${{ matrix.run_opts }}
@@ -173,8 +177,18 @@ jobs:
           ZJIT_BINDGEN_DIFF_OPTS: '--exit-code'
           LIBCLANG_PATH: ${{ matrix.libclang_path }}
           TESTS: ${{ matrix.test_all_opts }}
+        if: ${{ matrix.test_task != 'test-bundled-gems' }}
         continue-on-error: ${{ matrix.continue-on-test_task || false }}
 
+      - name: make test-bundled-gems
+        run: |
+          set -x
+          make -s test-bundled-gems
+        env:
+          # This env is specifically added to tool/test-bundled-gems.rb as a way to pass options to Rake tasks
+          TEST_BUNDLED_GEMS_RUBYOPT: ${{ matrix.run_opts }}
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
+
       - name: Dump crash logs
         if: ${{ failure() }}
         continue-on-error: true

tool/test-bundled-gems.rb

@@ -100,7 +100,15 @@
     group = :pgroup
     pg = "-"
   end
-  pid = Process.spawn(test_command, group => true)
+  if rubyopt = ENV["TEST_BUNDLED_GEMS_RUBYOPT"]
+    env = ENV.to_h
+    env["RUBYOPT"] = rubyopt
+    puts "TEST_BUNDLED_GEMS_RUBYOPT is specified. Adding `#{rubyopt}` to RUBYOPT"
+    pid = Process.spawn(env, test_command, group => true)
+  else
+    pid = Process.spawn(test_command, group => true)
+  end
+
   timeouts.each do |sig, sec|
     if sig
       puts "Sending #{sig} signal"