Skip to content

Commit 892421c

Browse files
committed
Make some zend_test dependencies explicit
Rather than checking that specific functions exist.
1 parent 6ce9076 commit 892421c

File tree

6 files changed

+9
-25
lines changed

6 files changed

+9
-25
lines changed

ext/sockets/tests/socket_export_stream-5.phpt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
socket_export_stream: effects of leaked handles
33
--EXTENSIONS--
44
sockets
5-
--SKIPIF--
6-
<?php
7-
8-
if (!function_exists('zend_leak_variable'))
9-
die('SKIP only for debug builds');
10-
?>
5+
zend_test
116
--INI--
127
report_memleaks=0
138
--FILE--

ext/sockets/tests/socket_import_stream-5.phpt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
socket_import_stream: effects of leaked handles
33
--EXTENSIONS--
44
sockets
5-
--SKIPIF--
6-
<?php
7-
8-
if (!function_exists('zend_leak_variable'))
9-
die('SKIP only for debug builds');
10-
?>
5+
zend_test
116
--INI--
127
report_memleaks=0
138
--FILE--

ext/standard/tests/file/bug52820.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
Bug #52820 (writes to fopencookie FILE* not committed when seeking the stream)
33
--EXTENSIONS--
44
curl
5+
zend_test
56
--SKIPIF--
67
<?php
7-
if (!function_exists('zend_leak_variable'))
8-
die("skip only for debug builds");
98
/* unfortunately no standard function does a cast to FILE*, so we need
109
* curl to test this */
1110
$handle=curl_init('file:///i_dont_exist/');

ext/standard/tests/file/stream_enclosed.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
--TEST--
22
Unexposed/leaked stream encloses another stream
3-
--SKIPIF--
4-
<?php
5-
if (!function_exists('zend_leak_variable')) die("skip only debug builds");
3+
--EXTENSIONS--
4+
zend_test
65
--FILE--
76
<?php
87
$s = fopen('php://temp/maxmemory=1024','wb+');

ext/standard/tests/strings/strcmp_unterminated.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
strnat(case)cmp(): potential OOB access for unterminated strings
3-
--SKIPIF--
4-
<?php
5-
if (!function_exists('zend_create_unterminated_string')) die('skip zend_test extension not available');
6-
?>
3+
--EXTENSIONS--
4+
zend_test
75
--FILE--
86
<?php
97
$a = zend_create_unterminated_string('333');

ext/standard/tests/url/parse_url_unterminated.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Test parse_url() function: Parse unterminated string
3-
--SKIPIF--
4-
<?php
5-
if (!function_exists('zend_create_unterminated_string')) die('skip ext/test required');
6-
?>
3+
--EXTENSIONS--
4+
zend_test
75
--FILE--
86
<?php
97

0 commit comments

Comments
 (0)