ZJIT: Run against all bootstrap tests

2 files changed, 2 insertions, 80 deletions

diff --git a/.github/workflows/zjit-macos.yml b/.github/workflows/zjit-macos.yml
index 41ff382382..b5cd6e711c 100644
--- a/.github/workflows/zjit-macos.yml
+++ b/.github/workflows/zjit-macos.yml
@@ -45,6 +45,7 @@ jobs:
 
           - test_task: 'btest'
             configure: '--enable-zjit=dev'
+            zjit_opts: '--zjit-call-threshold=1'
 
     env:
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
@@ -106,45 +107,6 @@ jobs:
           ruby -ne 'raise "Disassembly seems broken in dev build (output has too few lines)" unless $_.to_i > 10'
         if: ${{ contains(matrix.configure, 'jit=dev') }}
 
-      - name: btest
-        run: |
-          RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
-          ../src/bootstraptest/test_attr.rb \
-          ../src/bootstraptest/test_autoload.rb \
-          ../src/bootstraptest/test_block.rb \
-          ../src/bootstraptest/test_class.rb \
-          ../src/bootstraptest/test_constant_cache.rb \
-          ../src/bootstraptest/test_env.rb \
-          ../src/bootstraptest/test_eval.rb \
-          ../src/bootstraptest/test_exception.rb \
-          ../src/bootstraptest/test_fiber.rb \
-          ../src/bootstraptest/test_finalizer.rb \
-          ../src/bootstraptest/test_flip.rb \
-          ../src/bootstraptest/test_flow.rb \
-          ../src/bootstraptest/test_fork.rb \
-          ../src/bootstraptest/test_gc.rb \
-          ../src/bootstraptest/test_insns.rb \
-          ../src/bootstraptest/test_io.rb \
-          ../src/bootstraptest/test_jump.rb \
-          ../src/bootstraptest/test_literal.rb \
-          ../src/bootstraptest/test_literal_suffix.rb \
-          ../src/bootstraptest/test_load.rb \
-          ../src/bootstraptest/test_marshal.rb \
-          ../src/bootstraptest/test_massign.rb \
-          ../src/bootstraptest/test_method.rb \
-          ../src/bootstraptest/test_objectspace.rb \
-          ../src/bootstraptest/test_proc.rb \
-          ../src/bootstraptest/test_ractor.rb \
-          ../src/bootstraptest/test_string.rb \
-          ../src/bootstraptest/test_struct.rb \
-          ../src/bootstraptest/test_syntax.rb \
-          ../src/bootstraptest/test_thread.rb \
-          ../src/bootstraptest/test_yjit_30k_ifelse.rb \
-          ../src/bootstraptest/test_yjit_30k_methods.rb \
-          ../src/bootstraptest/test_yjit_rust_port.rb
-        # ../src/bootstraptest/test_yjit.rb \
-        if: ${{ matrix.test_task == 'btest' }}
-
       - name: make ${{ matrix.test_task }}
         run: >-
           make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
@@ -159,7 +121,6 @@ jobs:
           PRECHECK_BUNDLED_GEMS: 'no'
           TESTS: ${{ matrix.tests }}
         continue-on-error: ${{ matrix.continue-on-test_task || false }}
-        if: ${{ matrix.test_task != 'btest' }}
 
   result:
     if: ${{ always() }}
diff --git a/.github/workflows/zjit-ubuntu.yml b/.github/workflows/zjit-ubuntu.yml
index ea158262ec..69b2a547e2 100644
--- a/.github/workflows/zjit-ubuntu.yml
+++ b/.github/workflows/zjit-ubuntu.yml
@@ -66,6 +66,7 @@ jobs:
 
           - test_task: 'btest'
             configure: '--enable-zjit=dev'
+            zjit_opts: '--zjit-call-threshold=1'
 
     env:
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
@@ -147,45 +148,6 @@ jobs:
         run: ./miniruby --zjit -v | grep "+ZJIT"
         if: ${{ matrix.configure != '--disable-zjit' }}
 
-      - name: btest
-        run: |
-          RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
-          ../src/bootstraptest/test_attr.rb \
-          ../src/bootstraptest/test_autoload.rb \
-          ../src/bootstraptest/test_block.rb \
-          ../src/bootstraptest/test_class.rb \
-          ../src/bootstraptest/test_constant_cache.rb \
-          ../src/bootstraptest/test_env.rb \
-          ../src/bootstraptest/test_env.rb \
-          ../src/bootstraptest/test_exception.rb \
-          ../src/bootstraptest/test_fiber.rb \
-          ../src/bootstraptest/test_finalizer.rb \
-          ../src/bootstraptest/test_flip.rb \
-          ../src/bootstraptest/test_flow.rb \
-          ../src/bootstraptest/test_fork.rb \
-          ../src/bootstraptest/test_gc.rb \
-          ../src/bootstraptest/test_insns.rb \
-          ../src/bootstraptest/test_io.rb \
-          ../src/bootstraptest/test_jump.rb \
-          ../src/bootstraptest/test_literal.rb \
-          ../src/bootstraptest/test_literal_suffix.rb \
-          ../src/bootstraptest/test_load.rb \
-          ../src/bootstraptest/test_marshal.rb \
-          ../src/bootstraptest/test_massign.rb \
-          ../src/bootstraptest/test_method.rb \
-          ../src/bootstraptest/test_objectspace.rb \
-          ../src/bootstraptest/test_proc.rb \
-          ../src/bootstraptest/test_ractor.rb \
-          ../src/bootstraptest/test_string.rb \
-          ../src/bootstraptest/test_struct.rb \
-          ../src/bootstraptest/test_syntax.rb \
-          ../src/bootstraptest/test_thread.rb \
-          ../src/bootstraptest/test_yjit_30k_ifelse.rb \
-          ../src/bootstraptest/test_yjit_30k_methods.rb \
-          ../src/bootstraptest/test_yjit_rust_port.rb
-        # ../src/bootstraptest/test_yjit.rb \
-        if: ${{ matrix.test_task == 'btest' }}
-
       - name: make ${{ matrix.test_task }}
         run: >-
           make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
@@ -202,7 +164,6 @@ jobs:
           LIBCLANG_PATH: ${{ matrix.libclang_path }}
           TESTS: ${{ matrix.tests }}
         continue-on-error: ${{ matrix.continue-on-test_task || false }}
-        if: ${{ matrix.test_task != 'btest' }}
 
   result:
     if: ${{ always() }}