mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
azure/msan_job.yml
View File

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

1
azure/test.yml
View File

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

7
ext/standard/tests/general_functions/getservbyname_basic.phpt
View File

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

7
ext/standard/tests/general_functions/getservbyport_basic.phpt
View File

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

7
ext/standard/tests/general_functions/getservbyport_variation1.phpt
View File

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

1
ext/standard/tests/network/getmxrr.phpt
View File

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

9
ext/standard/tests/network/getprotobyname_basic.phpt
View File

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

4
ext/standard/tests/network/getprotobyname_error.phpt
View File

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

9
ext/standard/tests/network/getprotobynumber_basic.phpt
View File

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

4
ext/standard/tests/network/getprotobynumber_error.phpt
View File

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