Skip to content

Commit 6838145

Browse files
committed
Fix test failures when PHP is compiled without ZEND_CHECK_STACK_LIMIT
(e.g. 32-bit CLANG build with address sanitizer)
1 parent e335630 commit 6838145

12 files changed

+33
-0
lines changed

Zend/tests/stack_limit/stack_limit_001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Stack limit 001 - Stack limit checks with max_allowed_stack_size detection
33
--SKIPIF--
44
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
56
if (getenv('SKIP_MSAN')) die("skip msan requires a considerably higher zend.reserved_stack_size due to instrumentation");
67
?>
78
--EXTENSIONS--

Zend/tests/stack_limit/stack_limit_002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Stack limit 002 - Stack limit checks with max_allowed_stack_size detection (fibers)
33
--SKIPIF--
44
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
56
if (getenv('SKIP_MSAN')) die("skip msan requires a considerably higher zend.reserved_stack_size due to instrumentation");
67
?>
78
--EXTENSIONS--

Zend/tests/stack_limit/stack_limit_003.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--TEST--
22
Stack limit 003 - Stack limit checks with fixed max_allowed_stack_size
3+
--SKIPIF--
4+
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
6+
?>
37
--EXTENSIONS--
48
zend_test
59
--INI--

Zend/tests/stack_limit/stack_limit_004.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--TEST--
22
Stack limit 004 - Stack limit checks with fixed max_allowed_stack_size (fibers)
3+
--SKIPIF--
4+
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
6+
?>
37
--EXTENSIONS--
48
zend_test
59
--FILE--

Zend/tests/stack_limit/stack_limit_005.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--TEST--
22
Stack limit 005 - Internal stack limit check in zend_compile_expr()
3+
--SKIPIF--
4+
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
6+
?>
37
--EXTENSIONS--
48
zend_test
59
--INI--

Zend/tests/stack_limit/stack_limit_006.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Stack limit 006 - env size affects __libc_stack_end
33
--SKIPIF--
44
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
56
if (getenv('SKIP_MSAN')) die("skip msan requires a considerably higher zend.reserved_stack_size due to instrumentation");
67
?>
78
--EXTENSIONS--

Zend/tests/stack_limit/stack_limit_007.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--TEST--
22
Stack limit 007 - Exception handling
3+
--SKIPIF--
4+
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
6+
?>
37
--EXTENSIONS--
48
zend_test
59
--INI--

Zend/tests/stack_limit/stack_limit_008.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--TEST--
22
Stack limit 008 - Exception handling
3+
--SKIPIF--
4+
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
6+
?>
37
--EXTENSIONS--
48
zend_test
59
--INI--

Zend/tests/stack_limit/stack_limit_009.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Stack limit 009 - Check that we can actually use all the stack
33
--SKIPIF--
44
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
56
if (getenv('SKIP_MSAN')) die("skip msan requires a considerably higher zend.reserved_stack_size due to instrumentation");
67
?>
78
--EXTENSIONS--

Zend/tests/stack_limit/stack_limit_010.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Stack limit 010 - Check stack size detection against known defaults
44
zend_test
55
--SKIPIF--
66
<?php
7+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
78
if (!getenv('STACK_LIMIT_DEFAULTS_CHECK')) { die('skip STACK_LIMIT_DEFAULTS_CHECK not set'); }
89
?>
910
--FILE--

Zend/tests/stack_limit/stack_limit_011.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--TEST--
22
Stack limit 011 - Stack limit exhaustion during unwinding
3+
--SKIPIF--
4+
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
6+
?>
37
--EXTENSIONS--
48
zend_test
59
--INI--

Zend/tests/stack_limit/stack_limit_012.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--TEST--
22
Stack limit 012 - Stack limit exhaustion during unwinding
3+
--SKIPIF--
4+
<?php
5+
if (!function_exists('zend_test_zend_call_stack_get')) die("skip zend_test_zend_call_stack_get() is not available");
6+
?>
37
--EXTENSIONS--
48
zend_test
59
--INI--

0 commit comments

Comments
 (0)