Skip to content

Commit 36a87e6

Browse files
committed
Minimal backport of 098d9ca
1 parent 6e7e52d commit 36a87e6

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

.github/actions/test-linux/action.yml

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ inputs:
33
runTestsParameters:
44
default: ''
55
required: false
6+
jitType:
7+
default: 'disable'
8+
required: false
69
runs:
710
using: composite
811
steps:
@@ -27,6 +30,7 @@ runs:
2730
export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
2831
export SKIP_IO_CAPTURE_TESTS=1
2932
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
33+
-d opcache.jit=${{ inputs.jitType }} \
3034
-j$(/usr/bin/nproc) \
3135
-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
3236
--offline \

.github/actions/test-macos/action.yml

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ inputs:
33
runTestsParameters:
44
default: ''
55
required: false
6+
jitType:
7+
default: 'disable'
8+
required: false
69
runs:
710
using: composite
811
steps:
@@ -12,6 +15,7 @@ runs:
1215
export SKIP_IO_CAPTURE_TESTS=1
1316
export CI_NO_IPV6=1
1417
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
18+
-d opcache.jit=${{ inputs.jitType }} \
1519
-j$(sysctl -n hw.ncpu) \
1620
-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
1721
--offline \

.github/workflows/nightly.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
- name: Test Tracing JIT
8585
uses: ./.github/actions/test-linux
8686
with:
87+
jitType: tracing
8788
runTestsParameters: >-
8889
${{ matrix.run_tests_parameters }}
8990
-d zend_extension=opcache.so
@@ -102,12 +103,12 @@ jobs:
102103
if: matrix.test_function_jit
103104
uses: ./.github/actions/test-linux
104105
with:
106+
jitType: function
105107
runTestsParameters: >-
106108
${{ matrix.run_tests_parameters }}
107109
-d zend_extension=opcache.so
108110
-d opcache.enable_cli=1
109111
-d opcache.jit_buffer_size=16M
110-
-d opcache.jit=1205
111112
- name: Verify generated files are up to date
112113
uses: ./.github/actions/verify-generated-files
113114
- name: Notify Slack
@@ -165,6 +166,7 @@ jobs:
165166
- name: Test Tracing JIT
166167
uses: ./.github/actions/test-linux
167168
with:
169+
jitType: tracing
168170
runTestsParameters: >-
169171
${{ matrix.run_tests_parameters }}
170172
-d zend_extension=opcache.so
@@ -180,12 +182,12 @@ jobs:
180182
- name: Test Function JIT
181183
uses: ./.github/actions/test-linux
182184
with:
185+
jitType: function
183186
runTestsParameters: >-
184187
${{ matrix.run_tests_parameters }}
185188
-d zend_extension=opcache.so
186189
-d opcache.enable_cli=1
187190
-d opcache.jit_buffer_size=16M
188-
-d opcache.jit=1205
189191
- name: Notify Slack
190192
if: failure()
191193
uses: ./.github/actions/notify-slack
@@ -226,6 +228,7 @@ jobs:
226228
- name: Test Tracing JIT
227229
uses: ./.github/actions/test-macos
228230
with:
231+
jitType: tracing
229232
runTestsParameters: >-
230233
-d zend_extension=opcache.so
231234
-d opcache.enable_cli=1
@@ -241,12 +244,12 @@ jobs:
241244
- name: Test Function JIT
242245
uses: ./.github/actions/test-macos
243246
with:
247+
jitType: function
244248
runTestsParameters: >-
245249
-d zend_extension=opcache.so
246250
-d opcache.enable_cli=1
247251
-d opcache.protect_memory=1
248252
-d opcache.jit_buffer_size=16M
249-
-d opcache.jit=1205
250253
- name: Verify generated files are up to date
251254
uses: ./.github/actions/verify-generated-files
252255
- name: Notify Slack

.github/workflows/push.yml

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
- name: Test Tracing JIT
8686
uses: ./.github/actions/test-linux
8787
with:
88+
jitType: tracing
8889
runTestsParameters: >-
8990
-d zend_extension=opcache.so
9091
-d opcache.enable_cli=1
@@ -116,6 +117,7 @@ jobs:
116117
- name: Test Tracing JIT
117118
uses: ./.github/actions/test-macos
118119
with:
120+
jitType: tracing
119121
runTestsParameters: >-
120122
-d zend_extension=opcache.so
121123
-d opcache.enable_cli=1

0 commit comments

Comments
 (0)