Skip to content

Commit af948ae

Browse files
committed
Skip some tests under msan
These test functions which don't have msan interceptors. This results in false positives running msan on ubuntu 20.04.
1 parent 54e2ef0 commit af948ae

File tree

8 files changed

+31
-17
lines changed

8 files changed

+31
-17
lines changed

ext/standard/tests/general_functions/getservbyname_basic.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Michele Orselli (mo@ideato.it)
77
Simone Gentili (sensorario@gmail.com)
88
--SKIPIF--
99
<?php
10-
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
11-
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
12-
}
10+
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
11+
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
12+
}
13+
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyname()');
1314
?>
1415
--FILE--
1516
<?php

ext/standard/tests/general_functions/getservbyport_basic.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Michele Orselli (mo@ideato.it)
77
Simone Gentili (sensorario@gmail.com)
88
--SKIPIF--
99
<?php
10-
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
11-
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
12-
}
10+
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
11+
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
12+
}
13+
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyport()');
1314
?>
1415
--FILE--
1516
<?php

ext/standard/tests/general_functions/getservbyport_variation1.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ Michele Orselli (mo@ideato.it)
99
Simone Gentili (sensorario@gmail.com)
1010
--SKIPIF--
1111
<?php
12-
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
13-
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
14-
}
12+
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
13+
if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
14+
}
15+
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyport()');
1516
?>
1617
--FILE--
1718
<?php

ext/standard/tests/network/getmxrr.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
77
if (substr(PHP_OS, 0, 3) == 'WIN') {
88
die('skip: no Windows support');
99
}
10+
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for dn_expand()');
1011
?>
1112
--FILE--
1213
<?php

ext/standard/tests/network/getprotobyname_basic.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ getprotobyname function basic test
44
edgarsandi - <edgar.r.sandi@gmail.com>
55
--SKIPIF--
66
<?php
7-
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
8-
if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
9-
}
7+
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
8+
if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
9+
}
10+
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobyname()');
1011
?>
1112
--FILE--
1213
<?php
13-
var_dump(getprotobyname('tcp'));
14+
var_dump(getprotobyname('tcp'));
1415
?>
1516
--EXPECT--
1617
int(6)

ext/standard/tests/network/getprotobyname_error.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
getprotobyname function errors test
33
--CREDITS--
44
edgarsandi - <edgar.r.sandi@gmail.com>
5+
--SKIPIF--
6+
<?php
7+
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobyname()');
8+
?>
59
--FILE--
610
<?php
711
// invalid protocol name

ext/standard/tests/network/getprotobynumber_basic.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ getprotobynumber function basic test
44
edgarsandi - <edgar.r.sandi@gmail.com>
55
--SKIPIF--
66
<?php
7-
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
8-
if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
9-
}
7+
if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
8+
if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
9+
}
10+
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobynumber()');
1011
?>
1112
--FILE--
1213
<?php
13-
var_dump(getprotobynumber(6));
14+
var_dump(getprotobynumber(6));
1415
?>
1516
--EXPECT--
1617
string(3) "tcp"

ext/standard/tests/network/getprotobynumber_error.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
getprotobynumber function errors test
33
--CREDITS--
44
edgarsandi - <edgar.r.sandi@gmail.com>
5+
--SKIPIF--
6+
<?php
7+
if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobynumber()');
8+
?>
59
--FILE--
610
<?php
711
// invalid protocol number

0 commit comments

Comments
 (0)