summaryrefslogtreecommitdiff
path: root/sapi/phpdbg
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-06-03 10:02:31 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-06-03 10:02:31 +0200
commit180b9af58a94c17f67ae127467117d1f2b2a5199 (patch)
tree762d42a35195f8d35ebc5e30826bab63249334dd /sapi/phpdbg
parentc93c3b4f0efd97f83d9f90017c30e13ef40b52de (diff)
parent2a7d628adce5528a3e8e41ddbf5cbedcfb3ba461 (diff)
downloadphp-git-180b9af58a94c17f67ae127467117d1f2b2a5199.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Skip new watch point test under asan
Diffstat (limited to 'sapi/phpdbg')
-rw-r--r--sapi/phpdbg/tests/bug73927.phpt4
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/phpdbg/tests/bug73927.phpt b/sapi/phpdbg/tests/bug73927.phpt
index f1890e4850..ff2e32d1ef 100644
--- a/sapi/phpdbg/tests/bug73927.phpt
+++ b/sapi/phpdbg/tests/bug73927.phpt
@@ -2,9 +2,11 @@
Bug #73927 (phpdbg fails with windows error prompt at "watch array")
--SKIPIF--
<?php
+if (getenv('SKIP_ASAN')) {
+ die("skip intentionally causes segfaults");
+}
if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
die('xfail breakpoint/watchpoint issues with JIT on Windows');
-}
?>
--PHPDBG--
b 19