Skip to content

Commit b1ef9ed

Browse files
committed
Revert "DEBUG test only 'bcmath', 'oci8', 'pdo_oci' ext tests and 1 proc only"
1 parent 07e888f commit b1ef9ed

File tree

5 files changed

+66
-4
lines changed

5 files changed

+66
-4
lines changed

.github/actions/configure-x64/action.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,26 @@ runs:
1515
--prefix=/usr \
1616
--enable-phpdbg \
1717
--enable-fpm \
18+
--with-pdo-mysql=mysqlnd \
19+
--with-mysqli=mysqlnd \
20+
--with-pgsql \
21+
--with-pdo-pgsql \
1822
--with-pdo-sqlite \
23+
--enable-intl \
1924
--without-pear \
25+
--enable-gd \
26+
--with-jpeg \
27+
--with-webp \
28+
--with-freetype \
29+
--with-xpm \
30+
--enable-exif \
31+
--with-zip \
2032
--with-zlib \
2133
--with-zlib-dir=/usr \
34+
--enable-soap \
2235
--enable-xmlreader \
36+
--with-xsl \
37+
--with-tidy \
2338
--enable-sysvsem \
2439
--enable-sysvshm \
2540
--enable-shmop \
@@ -31,7 +46,11 @@ runs:
3146
--enable-sockets \
3247
--with-bz2 \
3348
--with-openssl \
49+
--with-gmp \
3450
--enable-bcmath \
51+
--enable-calendar \
52+
--enable-ftp \
53+
--with-pspell=/usr \
3554
--with-enchant=/usr \
3655
--with-kerberos \
3756
--enable-sysvmsg \
@@ -41,6 +60,7 @@ runs:
4160
--with-ldap-sasl \
4261
--with-password-argon2 \
4362
--with-mhash \
63+
--with-sodium \
4464
--enable-dba \
4565
--with-cdb \
4666
--enable-flatfile \
@@ -49,6 +69,11 @@ runs:
4969
--with-lmdb \
5070
--with-qdbm \
5171
--with-snmp \
72+
--with-unixODBC \
73+
--with-imap \
74+
--with-kerberos \
75+
--with-imap-ssl \
76+
--with-pdo-odbc=unixODBC,/usr \
5277
--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \
5378
--with-oci8=shared,instantclient,/opt/oracle/instantclient \
5479
--with-config-file-path=/etc \

.github/actions/setup-x64/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ runs:
1414
mysql -uroot -proot -e "SET GLOBAL local_infile = true"
1515
sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
1616
sudo -u postgres psql -c "CREATE DATABASE test;"
17+
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
1718
sudo locale-gen de_DE
1819
1920
./.github/scripts/setup-slapd.sh &>/dev/null

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
2626
export SKIP_IO_CAPTURE_TESTS=1
2727
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
28-
-j1 \
28+
-j$(/usr/bin/nproc) \
2929
-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
3030
--offline \
3131
--show-diff \

.github/workflows/push.yml

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ on:
1010
- CONTRIBUTING.md
1111
- CODING_STANDARDS.md
1212
branches:
13-
- '**'
13+
- PHP-7.4
14+
- PHP-8.0
15+
- PHP-8.1
16+
- master
1417
pull_request:
1518
branches:
1619
- '**'
@@ -29,6 +32,8 @@ jobs:
2932
steps:
3033
- name: git checkout
3134
uses: actions/checkout@v2
35+
- name: Create MSSQL container
36+
uses: ./.github/actions/setup-mssql
3237
- name: Create Oracle container
3338
uses: ./.github/actions/setup-oracle
3439
- name: apt
@@ -53,4 +58,35 @@ jobs:
5358
runTestsParameters: >-
5459
-d zend_extension=opcache.so
5560
-d opcache.enable_cli=1
56-
-d opcache.jit_buffer_size=16M
61+
-d opcache.jit_buffer_size=16M
62+
- name: Verify generated files are up to date
63+
uses: ./.github/actions/verify-generated-files
64+
MACOS_DEBUG_NTS:
65+
runs-on: macos-11
66+
steps:
67+
- name: git checkout
68+
uses: actions/checkout@v2
69+
- name: brew
70+
uses: ./.github/actions/brew
71+
- name: ./configure
72+
uses: ./.github/actions/configure-macos
73+
with:
74+
configurationParameters: --enable-debug --disable-zts
75+
- name: make
76+
run: |-
77+
export PATH="/usr/local/opt/bison/bin:$PATH"
78+
make -j$(sysctl -n hw.logicalcpu) >/dev/null
79+
- name: make install
80+
run: sudo make install
81+
- name: Test
82+
uses: ./.github/actions/test-macos
83+
- name: Test Tracing JIT
84+
uses: ./.github/actions/test-macos
85+
with:
86+
runTestsParameters: >-
87+
-d zend_extension=opcache.so
88+
-d opcache.enable_cli=1
89+
-d opcache.protect_memory=1
90+
-d opcache.jit_buffer_size=16M
91+
- name: Verify generated files are up to date
92+
uses: ./.github/actions/verify-generated-files

run-tests.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ function main(): void
754754
$ignored_by_ext = 0;
755755
sort($exts_to_test);
756756
$test_dirs = [];
757-
$optionals = ['ext/bcmath', 'ext/oci8', 'ext/pdo_oci'];
757+
$optionals = ['Zend', 'tests', 'ext', 'sapi'];
758758

759759
foreach ($optionals as $dir) {
760760
if (is_dir($dir)) {

0 commit comments

Comments
 (0)