Merge branch 'PHP-8.0'

* PHP-8.0:
  Update msan job to Ubuntu 20.04
  Skip some tests under msan

Author: nikic

azure/msan_job.yml

@@ -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: |

azure/test.yml

@@ -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) \

ext/standard/tests/general_functions/getservbyname_basic.phpt

@@ -7,9 +7,10 @@ Michele Orselli ([email protected])
 Simone Gentili ([email protected])
 --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

ext/standard/tests/general_functions/getservbyport_basic.phpt

@@ -7,9 +7,10 @@ Michele Orselli ([email protected])
 Simone Gentili ([email protected])
 --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

ext/standard/tests/general_functions/getservbyport_variation1.phpt

@@ -9,9 +9,10 @@ Michele Orselli ([email protected])
 Simone Gentili ([email protected])
 --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

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

ext/standard/tests/network/getprotobyname_basic.phpt

@@ -4,13 +4,14 @@ getprotobyname function basic test
 edgarsandi - <[email protected]>
 --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)

ext/standard/tests/network/getprotobyname_error.phpt

@@ -2,6 +2,10 @@
 getprotobyname function errors test
 --CREDITS--
 edgarsandi - <[email protected]>
+--SKIPIF--
+<?php
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobyname()');
+?>
 --FILE--
 <?php
 // invalid protocol name

ext/standard/tests/network/getprotobynumber_basic.phpt

@@ -4,13 +4,14 @@ getprotobynumber function basic test
 edgarsandi - <[email protected]>
 --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"

ext/standard/tests/network/getprotobynumber_error.phpt

@@ -2,6 +2,10 @@
 getprotobynumber function errors test
 --CREDITS--
 edgarsandi - <[email protected]>
+--SKIPIF--
+<?php
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobynumber()');
+?>
 --FILE--
 <?php
 // invalid protocol number