mirror of
https://github.com/php/php-src.git
synced 2025-08-16 14:08:47 +02:00
- Opss, reverted accidental changes
This commit is contained in:
parent
963abc546d
commit
ade487e693
10 changed files with 74 additions and 70 deletions
|
@ -1,5 +1,11 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
preg_replace_callback() with callback that modifies subject string
|
preg_replace_callback() with callback that modifies subject string
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if (@preg_match('/./u', '') === false) {
|
||||||
|
die('skip no utf8 support in PCRE library');
|
||||||
|
}
|
||||||
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
Backtracking limit
|
Backtracking limit
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
|
||||||
|
die("skip no support for \p support PCRE library");
|
||||||
|
}
|
||||||
|
?>
|
||||||
--INI--
|
--INI--
|
||||||
pcre.backtrack_limit=2
|
pcre.backtrack_limit=2
|
||||||
--FILE--
|
--FILE--
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
Bug #27103 (preg_split('//u') incorrectly splits UTF-8 strings into octets)
|
Bug #27103 (preg_split('//u') incorrectly splits UTF-8 strings into octets)
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if (@preg_match('/./u', '') === false) {
|
||||||
|
die('skip no utf8 support in PCRE library');
|
||||||
|
}
|
||||||
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
function iter($ar)
|
function iter($ar)
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
preg_replace() and invalid UTF8
|
preg_replace() and invalid UTF8
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if (@preg_match('/./u', '') === false) {
|
||||||
|
die('skip no utf8 support in PCRE library');
|
||||||
|
}
|
||||||
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
preg_replace() and invalid UTF8 offset
|
preg_replace() and invalid UTF8 offset
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if (@preg_match('/./u', '') === false) {
|
||||||
|
die('skip no utf8 support in PCRE library');
|
||||||
|
}
|
||||||
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
Localized match
|
Localized match
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
|
||||||
|
if (!function_exists('setlocale')) die('skip: setlocale() not available');
|
||||||
|
if (!@setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese')) die('skip pt locale not available');
|
||||||
|
|
||||||
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
A (PCRE_ANCHORED) modififer
|
A (PCRE_ANCHORED) modififer
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
|
||||||
|
die("skip no support for \p support PCRE library");
|
||||||
|
}
|
||||||
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
preg_replace()
|
preg_replace()
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if (@preg_match('/./u', '') === false) {
|
||||||
|
die('skip no utf8 support in PCRE library');
|
||||||
|
}
|
||||||
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
PCRE Recursion limit
|
PCRE Recursion limit
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
|
||||||
|
die("skip no support for \p support PCRE library");
|
||||||
|
}
|
||||||
|
?>
|
||||||
--INI--
|
--INI--
|
||||||
pcre.recursion_limit=2
|
pcre.recursion_limit=2
|
||||||
--FILE--
|
--FILE--
|
||||||
|
|
|
@ -814,24 +814,6 @@ foreach ($user_tests as $dir) {
|
||||||
find_files($dir, ($dir == 'ext'));
|
find_files($dir, ($dir == 'ext'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function find_ini_skip($path)
|
|
||||||
{
|
|
||||||
$skip_dir = $path;
|
|
||||||
$cwd = getcwd();
|
|
||||||
|
|
||||||
do {
|
|
||||||
if (in_array(basename($skip_dir), array('Zend', 'ext', '')) || $skip_dir == $cwd) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
$ini_skip_file = $skip_dir .'/skip.ini';
|
|
||||||
if (file_exists($ini_skip_file)) {
|
|
||||||
return $ini_skip_file;
|
|
||||||
}
|
|
||||||
} while ($skip_dir = dirname($skip_dir));
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function find_files($dir, $is_ext_dir = false, $ignore = false)
|
function find_files($dir, $is_ext_dir = false, $ignore = false)
|
||||||
{
|
{
|
||||||
global $test_files, $exts_to_test, $ignored_by_ext, $exts_skipped, $exts_tested;
|
global $test_files, $exts_to_test, $ignored_by_ext, $exts_skipped, $exts_tested;
|
||||||
|
@ -1403,56 +1385,21 @@ TEST $file
|
||||||
// Check if test should be skipped.
|
// Check if test should be skipped.
|
||||||
$info = '';
|
$info = '';
|
||||||
$warn = false;
|
$warn = false;
|
||||||
$skip_codes = array();
|
|
||||||
|
|
||||||
/* Using skip.ini */
|
|
||||||
if ($skip_ini = find_ini_skip($file)) {
|
|
||||||
$ini = parse_ini_file($skip_ini, true);
|
|
||||||
|
|
||||||
/* Skip on 32-bit architecture */
|
|
||||||
if (PHP_INT_SIZE == 4 && isset($ini['SKIP_32']['test'])
|
|
||||||
&& in_array(basename($file), $ini['SKIP_32']['test'])) {
|
|
||||||
show_result('SKIP', $tested, $tested_file, 'This test is for non 32-bit', $temp_filenames);
|
|
||||||
return 'SKIPPED';
|
|
||||||
}
|
|
||||||
/* Skip on 64-bit architecture */
|
|
||||||
if (PHP_INT_SIZE != 4 && isset($ini['SKIP_64']['test'])
|
|
||||||
&& in_array(basename($file), $ini['SKIP_64']['test'])) {
|
|
||||||
show_result('SKIP', $tested, $tested_file, 'This test is for 32-bit only', $temp_filenames);
|
|
||||||
return 'SKIPPED';
|
|
||||||
}
|
|
||||||
|
|
||||||
$labels = array_keys($ini);
|
if (array_key_exists('SKIPIF', $section_text)) {
|
||||||
foreach ($labels as $label) {
|
|
||||||
if (in_array($label, array('SKIP_32', 'SKIP_64'))) {
|
if (trim($section_text['SKIPIF'])) {
|
||||||
continue;
|
show_file_block('skip', $section_text['SKIPIF']);
|
||||||
}
|
save_text($test_skipif, $section_text['SKIPIF'], $temp_skipif);
|
||||||
if (isset($ini[$label]['skip']) && isset($ini[$label]['test'])) {
|
$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
|
||||||
if (!in_array(basename($file), $ini[$label]['test'])) {
|
"unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": "";
|
||||||
continue;
|
|
||||||
}
|
if ($leak_check) {
|
||||||
$code = '<?php ';
|
$env['USE_ZEND_ALLOC'] = '0';
|
||||||
foreach ($ini[$label]['skip'] as $skip_file) {
|
} else {
|
||||||
$code .= 'require_once "'. $skip_file .'";';
|
$env['USE_ZEND_ALLOC'] = '1';
|
||||||
}
|
}
|
||||||
$skip_codes[$label] = $code;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($section_text['SKIPIF']) && trim($section_text['SKIPIF'])) {
|
|
||||||
$skip_codes[] = $section_text['SKIPIF'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$env['USE_ZEND_ALLOC'] = $leak_check ? '0' : '1';
|
|
||||||
$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
|
|
||||||
"unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": "";
|
|
||||||
|
|
||||||
if (!empty($skip_codes)) {
|
|
||||||
foreach ($skip_codes as $label => $code) {
|
|
||||||
show_file_block('skip', $code);
|
|
||||||
save_text($test_skipif, $code, $temp_skipif);
|
|
||||||
|
|
||||||
$output = system_with_timeout("$extra $php $pass_options -q $ini_settings $test_skipif", $env);
|
$output = system_with_timeout("$extra $php $pass_options -q $ini_settings $test_skipif", $env);
|
||||||
|
|
||||||
if (!$cfg['keep']['skip']) {
|
if (!$cfg['keep']['skip']) {
|
||||||
|
@ -1460,10 +1407,12 @@ TEST $file
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strncasecmp('skip', ltrim($output), 4)) {
|
if (!strncasecmp('skip', ltrim($output), 4)) {
|
||||||
preg_match('/^\s*skip\s*(.+)\s*/i', $output, $m);
|
|
||||||
|
if (preg_match('/^\s*skip\s*(.+)\s*/i', $output, $m)) {
|
||||||
$reason = (is_string($label) && empty($m)) ? $label : (empty($m) ? 'not specified' : $m[1]);
|
show_result('SKIP', $tested, $tested_file, "reason: $m[1]", $temp_filenames);
|
||||||
show_result('SKIP', $tested, $tested_file, 'reason: '. $reason, $temp_filenames);
|
} else {
|
||||||
|
show_result('SKIP', $tested, $tested_file, '', $temp_filenames);
|
||||||
|
}
|
||||||
|
|
||||||
if (isset($old_php)) {
|
if (isset($old_php)) {
|
||||||
$php = $old_php;
|
$php = $old_php;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue