Skip to content

Commit 69148a8

Browse files
k0kubunk0kubun
authored
ZJIT: Partially enable btest on CI (ruby#13613)
1 parent a99d941 commit 69148a8

File tree

2 files changed

+86
-0
lines changed

2 files changed

+86
-0
lines changed

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ jobs:
4242
configure: '--enable-zjit=dev'
4343
tests: '../src/test/ruby/test_zjit.rb'
4444

45+
- test_task: 'btest'
46+
configure: '--enable-zjit=dev'
47+
4548
env:
4649
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
4750
RUN_OPTS: ${{ matrix.zjit_opts }}
@@ -100,6 +103,45 @@ jobs:
100103
ruby -ne 'raise "Disassembly seems broken in dev build (output has too few lines)" unless $_.to_i > 10'
101104
if: ${{ contains(matrix.configure, 'jit=dev') }}
102105

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

117160
result:
118161
if: ${{ always() }}

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ jobs:
4444
configure: '--enable-zjit=dev'
4545
tests: '../src/test/ruby/test_zjit.rb'
4646

47+
- test_task: 'btest'
48+
configure: '--enable-zjit=dev'
49+
4750
env:
4851
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
4952
RUN_OPTS: ${{ matrix.zjit_opts }}
@@ -122,6 +125,45 @@ jobs:
122125
run: ./miniruby --zjit -v | grep "+ZJIT"
123126
if: ${{ matrix.configure != '--disable-zjit' }}
124127

128+
- name: btest
129+
run: |
130+
RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
131+
../src/bootstraptest/test_attr.rb \
132+
../src/bootstraptest/test_constant_cache.rb \
133+
../src/bootstraptest/test_env.rb \
134+
../src/bootstraptest/test_finalizer.rb \
135+
../src/bootstraptest/test_flip.rb \
136+
../src/bootstraptest/test_literal.rb \
137+
../src/bootstraptest/test_literal_suffix.rb \
138+
../src/bootstraptest/test_massign.rb \
139+
../src/bootstraptest/test_string.rb \
140+
../src/bootstraptest/test_struct.rb \
141+
../src/bootstraptest/test_yjit_30k_ifelse.rb \
142+
../src/bootstraptest/test_yjit_30k_methods.rb
143+
# ../src/bootstraptest/test_autoload.rb \
144+
# ../src/bootstraptest/test_block.rb \
145+
# ../src/bootstraptest/test_class.rb \
146+
# ../src/bootstraptest/test_eval.rb \
147+
# ../src/bootstraptest/test_exception.rb \
148+
# ../src/bootstraptest/test_fiber.rb \
149+
# ../src/bootstraptest/test_flow.rb \
150+
# ../src/bootstraptest/test_fork.rb \
151+
# ../src/bootstraptest/test_gc.rb \
152+
# ../src/bootstraptest/test_insns.rb \
153+
# ../src/bootstraptest/test_io.rb \
154+
# ../src/bootstraptest/test_jump.rb \
155+
# ../src/bootstraptest/test_load.rb \
156+
# ../src/bootstraptest/test_marshal.rb \
157+
# ../src/bootstraptest/test_method.rb \
158+
# ../src/bootstraptest/test_objectspace.rb \
159+
# ../src/bootstraptest/test_proc.rb \
160+
# ../src/bootstraptest/test_ractor.rb \
161+
# ../src/bootstraptest/test_syntax.rb \
162+
# ../src/bootstraptest/test_thread.rb \
163+
# ../src/bootstraptest/test_yjit.rb \
164+
# ../src/bootstraptest/test_yjit_rust_port.rb \
165+
if: ${{ matrix.test_task == 'btest' }}
166+
125167
- name: make ${{ matrix.test_task }}
126168
run: >-
127169
make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
@@ -137,6 +179,7 @@ jobs:
137179
LIBCLANG_PATH: ${{ matrix.libclang_path }}
138180
TESTS: ${{ matrix.tests }}
139181
continue-on-error: ${{ matrix.continue-on-test_task || false }}
182+
if: ${{ matrix.test_task != 'btest' }}
140183

141184
result:
142185
if: ${{ always() }}

0 commit comments

Comments
 (0)