Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: [skip ci] Skip arginfo_zpp_mismatch on asan
php · Sep 11, 2023 · 1c93cdc · 1c93cdc
2 parents d1ef225 + 5286bab
commit 1c93cdc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Zend/tests/arginfo_zpp_mismatch.phpt b/Zend/tests/arginfo_zpp_mismatch.phpt
@@ -2,6 +2,7 @@
 Test that there is no arginfo/zpp mismatch
 --SKIPIF--
 <?php
+if (getenv('SKIP_ASAN')) die("skip Intermittently crashes lsan");
 if (getenv('SKIP_MSAN')) die("skip msan misses interceptors for some functions");
 ?>
 --FILE--

diff --git a/Zend/tests/arginfo_zpp_mismatch_strict.phpt b/Zend/tests/arginfo_zpp_mismatch_strict.phpt
@@ -2,6 +2,7 @@
 Test that there is no arginfo/zpp mismatch in strict mode
 --SKIPIF--
 <?php
+if (getenv('SKIP_ASAN')) die("skip Intermittently crashes lsan");
 if (getenv('SKIP_MSAN')) die("skip msan misses interceptors for some functions");
 ?>
 --FILE--