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.
php · May 7, 2021 · af948ae · af948ae
1 parent 54e2ef0
commit af948ae
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 17 deletions.
diff --git a/ext/standard/tests/general_functions/getservbyname_basic.phpt b/ext/standard/tests/general_functions/getservbyname_basic.phpt
@@ -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

diff --git a/ext/standard/tests/general_functions/getservbyport_basic.phpt b/ext/standard/tests/general_functions/getservbyport_basic.phpt
@@ -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

diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
@@ -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

diff --git a/ext/standard/tests/network/getmxrr.phpt b/ext/standard/tests/network/getmxrr.phpt
@@ -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

diff --git a/ext/standard/tests/network/getprotobyname_basic.phpt b/ext/standard/tests/network/getprotobyname_basic.phpt
@@ -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)
diff --git a/ext/standard/tests/network/getprotobyname_error.phpt b/ext/standard/tests/network/getprotobyname_error.phpt
@@ -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

diff --git a/ext/standard/tests/network/getprotobynumber_basic.phpt b/ext/standard/tests/network/getprotobynumber_basic.phpt
@@ -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"
diff --git a/ext/standard/tests/network/getprotobynumber_error.phpt b/ext/standard/tests/network/getprotobynumber_error.phpt
@@ -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