Skip to content

Commit 1f76b09

Browse files
st0012XrXr
st0012
authored and
XrXr
committed
ZJIT: Run against all bootstrap tests
1 parent 7300b3d commit 1f76b09

File tree

2 files changed

+2
-80
lines changed

2 files changed

+2
-80
lines changed

‎.github/workflows/zjit-macos.yml‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545

4646
- test_task: 'btest'
4747
configure: '--enable-zjit=dev'
48+
zjit_opts: '--zjit-call-threshold=1'
4849

4950
env:
5051
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
@@ -106,45 +107,6 @@ jobs:
106107
ruby -ne 'raise "Disassembly seems broken in dev build (output has too few lines)" unless $_.to_i > 10'
107108
if: ${{ contains(matrix.configure, 'jit=dev') }}
108109

109-
- name: btest
110-
run: |
111-
RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
112-
../src/bootstraptest/test_attr.rb \
113-
../src/bootstraptest/test_autoload.rb \
114-
../src/bootstraptest/test_block.rb \
115-
../src/bootstraptest/test_class.rb \
116-
../src/bootstraptest/test_constant_cache.rb \
117-
../src/bootstraptest/test_env.rb \
118-
../src/bootstraptest/test_eval.rb \
119-
../src/bootstraptest/test_exception.rb \
120-
../src/bootstraptest/test_fiber.rb \
121-
../src/bootstraptest/test_finalizer.rb \
122-
../src/bootstraptest/test_flip.rb \
123-
../src/bootstraptest/test_flow.rb \
124-
../src/bootstraptest/test_fork.rb \
125-
../src/bootstraptest/test_gc.rb \
126-
../src/bootstraptest/test_insns.rb \
127-
../src/bootstraptest/test_io.rb \
128-
../src/bootstraptest/test_jump.rb \
129-
../src/bootstraptest/test_literal.rb \
130-
../src/bootstraptest/test_literal_suffix.rb \
131-
../src/bootstraptest/test_load.rb \
132-
../src/bootstraptest/test_marshal.rb \
133-
../src/bootstraptest/test_massign.rb \
134-
../src/bootstraptest/test_method.rb \
135-
../src/bootstraptest/test_objectspace.rb \
136-
../src/bootstraptest/test_proc.rb \
137-
../src/bootstraptest/test_ractor.rb \
138-
../src/bootstraptest/test_string.rb \
139-
../src/bootstraptest/test_struct.rb \
140-
../src/bootstraptest/test_syntax.rb \
141-
../src/bootstraptest/test_thread.rb \
142-
../src/bootstraptest/test_yjit_30k_ifelse.rb \
143-
../src/bootstraptest/test_yjit_30k_methods.rb \
144-
../src/bootstraptest/test_yjit_rust_port.rb
145-
# ../src/bootstraptest/test_yjit.rb \
146-
if: ${{ matrix.test_task == 'btest' }}
147-
148110
- name: make ${{ matrix.test_task }}
149111
run: >-
150112
make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
@@ -159,7 +121,6 @@ jobs:
159121
PRECHECK_BUNDLED_GEMS: 'no'
160122
TESTS: ${{ matrix.tests }}
161123
continue-on-error: ${{ matrix.continue-on-test_task || false }}
162-
if: ${{ matrix.test_task != 'btest' }}
163124

164125
result:
165126
if: ${{ always() }}

‎.github/workflows/zjit-ubuntu.yml‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666

6767
- test_task: 'btest'
6868
configure: '--enable-zjit=dev'
69+
zjit_opts: '--zjit-call-threshold=1'
6970

7071
env:
7172
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
@@ -147,45 +148,6 @@ jobs:
147148
run: ./miniruby --zjit -v | grep "+ZJIT"
148149
if: ${{ matrix.configure != '--disable-zjit' }}
149150

150-
- name: btest
151-
run: |
152-
RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
153-
../src/bootstraptest/test_attr.rb \
154-
../src/bootstraptest/test_autoload.rb \
155-
../src/bootstraptest/test_block.rb \
156-
../src/bootstraptest/test_class.rb \
157-
../src/bootstraptest/test_constant_cache.rb \
158-
../src/bootstraptest/test_env.rb \
159-
../src/bootstraptest/test_env.rb \
160-
../src/bootstraptest/test_exception.rb \
161-
../src/bootstraptest/test_fiber.rb \
162-
../src/bootstraptest/test_finalizer.rb \
163-
../src/bootstraptest/test_flip.rb \
164-
../src/bootstraptest/test_flow.rb \
165-
../src/bootstraptest/test_fork.rb \
166-
../src/bootstraptest/test_gc.rb \
167-
../src/bootstraptest/test_insns.rb \
168-
../src/bootstraptest/test_io.rb \
169-
../src/bootstraptest/test_jump.rb \
170-
../src/bootstraptest/test_literal.rb \
171-
../src/bootstraptest/test_literal_suffix.rb \
172-
../src/bootstraptest/test_load.rb \
173-
../src/bootstraptest/test_marshal.rb \
174-
../src/bootstraptest/test_massign.rb \
175-
../src/bootstraptest/test_method.rb \
176-
../src/bootstraptest/test_objectspace.rb \
177-
../src/bootstraptest/test_proc.rb \
178-
../src/bootstraptest/test_ractor.rb \
179-
../src/bootstraptest/test_string.rb \
180-
../src/bootstraptest/test_struct.rb \
181-
../src/bootstraptest/test_syntax.rb \
182-
../src/bootstraptest/test_thread.rb \
183-
../src/bootstraptest/test_yjit_30k_ifelse.rb \
184-
../src/bootstraptest/test_yjit_30k_methods.rb \
185-
../src/bootstraptest/test_yjit_rust_port.rb
186-
# ../src/bootstraptest/test_yjit.rb \
187-
if: ${{ matrix.test_task == 'btest' }}
188-
189151
- name: make ${{ matrix.test_task }}
190152
run: >-
191153
make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
@@ -202,7 +164,6 @@ jobs:
202164
LIBCLANG_PATH: ${{ matrix.libclang_path }}
203165
TESTS: ${{ matrix.tests }}
204166
continue-on-error: ${{ matrix.continue-on-test_task || false }}
205-
if: ${{ matrix.test_task != 'btest' }}
206167

207168
result:
208169
if: ${{ always() }}

0 commit comments

Comments
 (0)