Skip to content

Commit 2cf0a67

Browse files
committed
Fix "Tracing JIT" testing, opcache must be enabled for CLI
1 parent 153c4ab commit 2cf0a67

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ runs:
1010
sudo chmod 777 /etc/php.d
1111
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
1212
echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
13-
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
14-
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini

.github/workflows/nightly.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,28 @@ jobs:
6868
with:
6969
runTestsParameters: >-
7070
${{ matrix.run_tests_parameters }}
71-
- name: Test Tracing JIT
71+
- name: Test OpCache
7272
uses: ./.github/actions/test-linux
7373
with:
7474
runTestsParameters: >-
7575
${{ matrix.run_tests_parameters }}
7676
-d zend_extension=opcache.so
77-
-d opcache.jit_buffer_size=16M
78-
- name: Test OpCache
77+
-d opcache.enable_cli=1
78+
- name: Test Tracing JIT
7979
uses: ./.github/actions/test-linux
8080
with:
8181
runTestsParameters: >-
8282
${{ matrix.run_tests_parameters }}
8383
-d zend_extension=opcache.so
84+
-d opcache.enable_cli=1
85+
-d opcache.jit_buffer_size=16M
8486
- name: Test Function JIT
8587
uses: ./.github/actions/test-linux
8688
with:
8789
runTestsParameters: >-
8890
${{ matrix.run_tests_parameters }}
8991
-d zend_extension=opcache.so
92+
-d opcache.enable_cli=1
9093
-d opcache.jit_buffer_size=16M
9194
-d opcache.jit=1205
9295
MACOS:
@@ -121,24 +124,27 @@ jobs:
121124
run: sudo make install
122125
- name: Test
123126
uses: ./.github/actions/test-macos
124-
- name: Test Tracing JIT
127+
- name: Test OpCache
125128
uses: ./.github/actions/test-macos
126129
with:
127130
runTestsParameters: >-
128131
-d zend_extension=opcache.so
132+
-d opcache.enable_cli=1
129133
-d opcache.protect_memory=1
130-
-d opcache.jit_buffer_size=16M
131-
- name: Test OpCache
134+
- name: Test Tracing JIT
132135
uses: ./.github/actions/test-macos
133136
with:
134137
runTestsParameters: >-
135138
-d zend_extension=opcache.so
139+
-d opcache.enable_cli=1
136140
-d opcache.protect_memory=1
141+
-d opcache.jit_buffer_size=16M
137142
- name: Test Function JIT
138143
uses: ./.github/actions/test-macos
139144
with:
140145
runTestsParameters: >-
141146
-d zend_extension=opcache.so
147+
-d opcache.enable_cli=1
142148
-d opcache.protect_memory=1
143149
-d opcache.jit_buffer_size=16M
144150
-d opcache.jit=1205

.github/workflows/push.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ jobs:
5353
- name: Test Tracing JIT
5454
uses: ./.github/actions/test-linux
5555
with:
56-
runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
56+
runTestsParameters: >-
57+
-d zend_extension=opcache.so
58+
-d opcache.enable_cli=1
59+
-d opcache.jit_buffer_size=16M
5760
MACOS_DEBUG_NTS:
5861
runs-on: macos-10.15
5962
steps:
@@ -78,5 +81,6 @@ jobs:
7881
with:
7982
runTestsParameters: >-
8083
-d zend_extension=opcache.so
84+
-d opcache.enable_cli=1
8185
-d opcache.protect_memory=1
8286
-d opcache.jit_buffer_size=16M

0 commit comments

Comments
 (0)