Merge branch 'PHP-7.4'

8 files changed, 22 insertions, 3 deletions

diff --git a/ext/fileinfo/tests/cve-2014-3538-nojit.phpt b/ext/fileinfo/tests/cve-2014-3538-nojit.phpt
index 2dc5ddbc5e..0072ab2047 100644
--- a/ext/fileinfo/tests/cve-2014-3538-nojit.phpt
+++ b/ext/fileinfo/tests/cve-2014-3538-nojit.phpt
@@ -4,6 +4,8 @@ Bug #66731: file: extensive backtraking, with pcre.jit=0
 <?php
 if (defined("PHP_DEBUG") && PHP_DEBUG)
 	die("skip not suitable for debug build");
+if (getenv('SKIP_PERF_SENSITIVE'))
+    die("skip performance sensitive test");
 if (!class_exists('finfo'))
 	die('skip no fileinfo extension');
 ?>
diff --git a/ext/opcache/tests/log_verbosity_bug.phpt b/ext/opcache/tests/log_verbosity_bug.phpt
index e23bb8758f..a2c2f4f30a 100644
--- a/ext/opcache/tests/log_verbosity_bug.phpt
+++ b/ext/opcache/tests/log_verbosity_bug.phpt
@@ -12,7 +12,10 @@ opcache.file_cache_fallback=0
 opcache.memory_consumption=999999999
 opcache.log_verbosity_level=-1
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+if (getenv('SKIP_ASAN')) die('xfail Startup failure leak');
+?>
 --FILE--
 <?php
 var_dump("Script should fail");
diff --git a/ext/opcache/tests/preload_006.phpt b/ext/opcache/tests/preload_006.phpt
index 17d792ecd1..b597d8eff8 100644
--- a/ext/opcache/tests/preload_006.phpt
+++ b/ext/opcache/tests/preload_006.phpt
@@ -6,7 +6,10 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_inheritance_error_ind.inc
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+if (getenv('SKIP_ASAN')) die('xfail Startup failure leak');
+?>
 --FILE--
 <?php
 echo "Foobar\n";
diff --git a/ext/pcntl/tests/pcntl_unshare_02.phpt b/ext/pcntl/tests/pcntl_unshare_02.phpt
index a046759730..bdcb6120ef 100644
--- a/ext/pcntl/tests/pcntl_unshare_02.phpt
+++ b/ext/pcntl/tests/pcntl_unshare_02.phpt
@@ -6,6 +6,7 @@ if (!extension_loaded("pcntl")) die("skip");
 if (!extension_loaded("posix")) die("skip posix extension not available");
 if (!function_exists("pcntl_unshare")) die("skip pcntl_unshare is not available");
 if (!defined("CLONE_NEWPID")) die("skip flag unavailable");
+if (getenv("SKIP_ASAN")) die("skip asan chokes on this");
 if (posix_getuid() !== 0 &&
     (!defined("CLONE_NEWUSER") ||
     (pcntl_unshare(CLONE_NEWUSER) == false && pcntl_get_last_error() == PCNTL_EPERM))) {
diff --git a/ext/pcre/tests/bug72685.phpt b/ext/pcre/tests/bug72685.phpt
index 7f6eabc182..31b2f9b0c7 100644
--- a/ext/pcre/tests/bug72685.phpt
+++ b/ext/pcre/tests/bug72685.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Bug #72685: Same string is UTF-8 validated repeatedly
+--SKIPIF--
+<?php
+if (getenv('SKIP_PERF_SENSITIVE')) die("skip performance sensitive test");
+?>
 --FILE--
 <?php
 
diff --git a/ext/pspell/tests/005.phpt b/ext/pspell/tests/005.phpt
index 083b4c1871..3081227a31 100644
--- a/ext/pspell/tests/005.phpt
+++ b/ext/pspell/tests/005.phpt
@@ -4,6 +4,7 @@ pspell configs
 <?php
 if (!extension_loaded('pspell')) die('skip');
 if (!@pspell_new('en')) die('skip English dictionary is not available');
+if (getenv('SKIP_ASAN')) die('skip pspell leaks memory for invalid dicationaries');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
index b273e512d0..6b975cd496 100644
--- a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
+++ b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
@@ -5,6 +5,8 @@ Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --INI--
 magic_quotes_gpc=1
+--SKIPIF--
+<?php if (getenv('SKIP_ASAN')) die('xfail Startup failure leak'); ?>
 --FILE--
 <?php
 echo "*** Test by calling method or function with deprecated option ***\n";
diff --git a/ext/xsl/tests/bug33853.phpt b/ext/xsl/tests/bug33853.phpt
index 16d7f73ced..a2e835ff6d 100644
--- a/ext/xsl/tests/bug33853.phpt
+++ b/ext/xsl/tests/bug33853.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Bug #33853 (php:function call __autoload with lowercase param)
 --SKIPIF--
-<?php if (!extension_loaded('xsl')) die('skip xsl not loaded'); ?>
+<?php
+if (!extension_loaded('xsl')) die('skip xsl not loaded');
+if (getenv('SKIP_ASAN')) die('xfail bailing out across foreign C code');
+?>
 --FILE--
 <?php