From 5f4c04bb38e62abe5d15f0e3c53806dfcecd6cc4 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sat, 30 Dec 2023 10:48:43 +0000 Subject: [PATCH 1/7] FreeBSD CI image update. --- .cirrus.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7db6ce1a9112e..2733d9ff8097d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,7 +4,7 @@ env: freebsd_task: name: FREEBSD_DEBUG_NTS freebsd_instance: - image_family: freebsd-13-3 + image_family: freebsd-14-0 env: ARCH: amd64 install_script: @@ -14,8 +14,8 @@ freebsd_task: - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif script: - ./buildconf -f - - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d - - gmake -j2 + - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d + - gmake -j$(sysctl -n hw.ncpu) > /dev/null - mkdir /etc/php.d - gmake install - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini @@ -26,4 +26,4 @@ freebsd_task: - export SKIP_IO_CAPTURE_TESTS=1 - export CI_NO_IPV6=1 - export STACK_LIMIT_DEFAULTS_CHECK=1 - - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so + - sapi/cli/php run-tests.php -P -q -j1 -g FAIL,BORK,LEAK,XLEAK --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so From b93c98f051842324689cfd941a313e92c9b215f2 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Thu, 14 Mar 2024 20:18:46 +0000 Subject: [PATCH 2/7] fix socket tcp_congestion test seems fbsd 14 had switched to cubic algo. --- ext/sockets/tests/socket_tcp_congestion.phpt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ext/sockets/tests/socket_tcp_congestion.phpt b/ext/sockets/tests/socket_tcp_congestion.phpt index 56b587618548a..b7e9b13ff7455 100644 --- a/ext/sockets/tests/socket_tcp_congestion.phpt +++ b/ext/sockets/tests/socket_tcp_congestion.phpt @@ -11,11 +11,7 @@ if (!defined('TCP_CONGESTION')) { --FILE-- Date: Thu, 14 Mar 2024 20:56:28 +0000 Subject: [PATCH 3/7] temporarily disable another socket test --- ext/sockets/tests/socket_sentto_recvfrom_unix.phpt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt index 72594f0506b90..ac16ffecd1d5f 100644 --- a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt +++ b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt @@ -7,6 +7,10 @@ sockets if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not valid for Windows'); } +// FreeBSD 14 bug ? even with non-sense protocol socket_create here does not warn +if (PHP_OS == 'FreeBSD') { + die('skip.. warning not triggered on freebsd'); +} ?> --FILE-- Date: Thu, 14 Mar 2024 21:56:46 +0000 Subject: [PATCH 4/7] update one locale test where list of available locales can t be set with LC_ALL on freebsd 14. --- ext/standard/tests/strings/setlocale_variation2.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt index 6f62f71ac1f26..49eadc400a89f 100644 --- a/ext/standard/tests/strings/setlocale_variation2.phpt +++ b/ext/standard/tests/strings/setlocale_variation2.phpt @@ -53,7 +53,7 @@ echo "-- Test setlocale() with all available locale in the system --\n"; // try n set each locale using setlocale() and keep track failures, if any foreach($all_system_locales as $value){ //set locale to $value, if success, count increments - if(setlocale(LC_ALL,$value )){ + if(setlocale(LC_CTYPE,$value )){ $success_count++; } else{ From ba1838a27e4d6cdbfb8f70c130358a142dcb9247 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sat, 23 Mar 2024 23:14:20 +0000 Subject: [PATCH 5/7] debug --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 2733d9ff8097d..701e99255f062 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,6 +11,7 @@ freebsd_task: #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf #- pkg upgrade -y - kldload accf_http + - sysctl hw.ncpu - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif script: - ./buildconf -f From 576fc6765debc04a44642378fd2c75ff5b2edb06 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sat, 23 Mar 2024 23:30:23 +0000 Subject: [PATCH 6/7] fix configure part --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 701e99255f062..75e74d01f8e53 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -15,7 +15,7 @@ freebsd_task: - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif script: - ./buildconf -f - - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d + - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d - gmake -j$(sysctl -n hw.ncpu) > /dev/null - mkdir /etc/php.d - gmake install From 2e2c26a9462689f0859bd0ddde1f9c1a4490a558 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sat, 23 Mar 2024 23:50:42 +0000 Subject: [PATCH 7/7] parallel tests --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 75e74d01f8e53..de3de3d666d13 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,4 +27,4 @@ freebsd_task: - export SKIP_IO_CAPTURE_TESTS=1 - export CI_NO_IPV6=1 - export STACK_LIMIT_DEFAULTS_CHECK=1 - - sapi/cli/php run-tests.php -P -q -j1 -g FAIL,BORK,LEAK,XLEAK --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so + - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so