Merge branch 'PHP-8.0'

* PHP-8.0:
  Update msan job to Ubuntu 20.04
  Skip some tests under msan
This commit is contained in:
Nikita Popov 2021-05-07 16:28:57 +02:00
commit 072c50fc77
10 changed files with 32 additions and 19 deletions

View file

@ -8,7 +8,7 @@ jobs:
- job: ${{ parameters.configurationName }} - job: ${{ parameters.configurationName }}
timeoutInMinutes: ${{ parameters.timeoutInMinutes }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
pool: pool:
vmImage: 'ubuntu-18.04' vmImage: 'ubuntu-20.04'
steps: steps:
- template: apt.yml - template: apt.yml
- script: | - script: |

View file

@ -15,7 +15,6 @@ steps:
export TEST_PHP_JUNIT=junit.xml export TEST_PHP_JUNIT=junit.xml
export REPORT_EXIT_STATUS=no export REPORT_EXIT_STATUS=no
export SKIP_IO_CAPTURE_TESTS=1 export SKIP_IO_CAPTURE_TESTS=1
export MSAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer
rm -rf junit.xml | true rm -rf junit.xml | true
sapi/cli/php run-tests.php -P -q \ sapi/cli/php run-tests.php -P -q \
-j$(/usr/bin/nproc) \ -j$(/usr/bin/nproc) \

View file

@ -7,9 +7,10 @@ Michele Orselli (mo@ideato.it)
Simone Gentili (sensorario@gmail.com) Simone Gentili (sensorario@gmail.com)
--SKIPIF-- --SKIPIF--
<?php <?php
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services"); if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
} }
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyname()');
?> ?>
--FILE-- --FILE--
<?php <?php

View file

@ -7,9 +7,10 @@ Michele Orselli (mo@ideato.it)
Simone Gentili (sensorario@gmail.com) Simone Gentili (sensorario@gmail.com)
--SKIPIF-- --SKIPIF--
<?php <?php
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services"); if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
} }
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyport()');
?> ?>
--FILE-- --FILE--
<?php <?php

View file

@ -9,9 +9,10 @@ Michele Orselli (mo@ideato.it)
Simone Gentili (sensorario@gmail.com) Simone Gentili (sensorario@gmail.com)
--SKIPIF-- --SKIPIF--
<?php <?php
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services"); if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
} }
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyport()');
?> ?>
--FILE-- --FILE--
<?php <?php

View file

@ -7,6 +7,7 @@ if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
if (substr(PHP_OS, 0, 3) == 'WIN') { if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip: no Windows support'); die('skip: no Windows support');
} }
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for dn_expand()');
?> ?>
--FILE-- --FILE--
<?php <?php

View file

@ -4,13 +4,14 @@ getprotobyname function basic test
edgarsandi - <edgar.r.sandi@gmail.com> edgarsandi - <edgar.r.sandi@gmail.com>
--SKIPIF-- --SKIPIF--
<?php <?php
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols"); if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
} }
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobyname()');
?> ?>
--FILE-- --FILE--
<?php <?php
var_dump(getprotobyname('tcp')); var_dump(getprotobyname('tcp'));
?> ?>
--EXPECT-- --EXPECT--
int(6) int(6)

View file

@ -2,6 +2,10 @@
getprotobyname function errors test getprotobyname function errors test
--CREDITS-- --CREDITS--
edgarsandi - <edgar.r.sandi@gmail.com> edgarsandi - <edgar.r.sandi@gmail.com>
--SKIPIF--
<?php
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobyname()');
?>
--FILE-- --FILE--
<?php <?php
// invalid protocol name // invalid protocol name

View file

@ -4,13 +4,14 @@ getprotobynumber function basic test
edgarsandi - <edgar.r.sandi@gmail.com> edgarsandi - <edgar.r.sandi@gmail.com>
--SKIPIF-- --SKIPIF--
<?php <?php
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){ if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols"); if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
} }
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobynumber()');
?> ?>
--FILE-- --FILE--
<?php <?php
var_dump(getprotobynumber(6)); var_dump(getprotobynumber(6));
?> ?>
--EXPECT-- --EXPECT--
string(3) "tcp" string(3) "tcp"

View file

@ -2,6 +2,10 @@
getprotobynumber function errors test getprotobynumber function errors test
--CREDITS-- --CREDITS--
edgarsandi - <edgar.r.sandi@gmail.com> edgarsandi - <edgar.r.sandi@gmail.com>
--SKIPIF--
<?php
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobynumber()');
?>
--FILE-- --FILE--
<?php <?php
// invalid protocol number // invalid protocol number