Skip to content

Commit 50a3fa4

Browse files
committed
Fix observer test
1 parent 7804cff commit 50a3fa4

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

ext/zend_test/observer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static void observer_set_user_opcode_handler(const char *opcode_names, user_opco
6161

6262
static void observer_show_opcode(zend_execute_data *execute_data)
6363
{
64-
if (!ZT_G(observer_show_opcode)) {
64+
if (!ZT_G(observer_show_opcode) || !ZEND_USER_CODE(EX(func)->type)) {
6565
return;
6666
}
6767
php_printf("%*s<!-- opcode: '%s' -->\n", 2 * ZT_G(observer_nesting_depth), "", zend_get_opcode_name(EX(opline)->opcode));

ext/zend_test/tests/observer_bug81430_2.phpt

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ zend_test
66
memory_limit=20M
77
zend_test.observer.enabled=1
88
zend_test.observer.observe_all=1
9+
--SKIPIF--
10+
<?php
11+
if (getenv("USE_ZEND_ALLOC") === "0") die("skip requires zmm");
12+
?>
913
--FILE--
1014
<?php
1115

ext/zend_test/tests/observer_bug81435.phpt

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ memory_limit=20M
77
zend_test.observer.enabled=1
88
zend_test.observer.observe_function_names=a,d
99
opcache.optimization_level=0
10+
--SKIPIF--
11+
<?php
12+
if (getenv("USE_ZEND_ALLOC") === "0") die("skip requires zmm");
13+
?>
1014
--FILE--
1115
<?php
1216

ext/zend_test/tests/observer_error_01.phpt

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ zend_test.observer.enabled=1
77
zend_test.observer.observe_all=1
88
zend_test.observer.show_return_value=1
99
memory_limit=2M
10+
--SKIPIF--
11+
<?php
12+
if (getenv("USE_ZEND_ALLOC") === "0") die("skip requires zmm");
13+
?>
1014
--FILE--
1115
<?php
1216
function foo()

ext/zend_test/tests/observer_opline_01.phpt

-3
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ foo_observer_test
4545
<!-- opcode: 'ZEND_RETURN' -->
4646
</file '%s'>
4747
<!-- init array_sum() -->
48-
<!-- opcode: 'ZEND_RETURN' -->
4948
<array_sum>
50-
<!-- opcode: 'ZEND_RETURN' -->
51-
<!-- opcode: 'ZEND_RETURN' -->
5249
</array_sum>
5350
6
5451
<foo>

0 commit comments

Comments
 (0)