felipe Mon Nov 3 13:07:28 2008 UTC Modified files: (Branch: PHP_5_3) /php-src run-tests.php /php-src/ext/pcre/tests 007.phpt backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt invalid_utf8_offset.phpt locales.phpt pcre_anchored.phpt preg_replace2.phpt recursion_limit.phpt Log: - Opss, reverted accidental changes
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.50&r2=1.226.2.37.2.35.2.51&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.50 php-src/run-tests.php:1.226.2.37.2.35.2.51 --- php-src/run-tests.php:1.226.2.37.2.35.2.50 Sun Nov 2 21:19:30 2008 +++ php-src/run-tests.php Mon Nov 3 13:07:28 2008 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.50 2008/11/02 21:19:30 felipe Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28 felipe Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -612,7 +612,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.50 $' . "\n"; + echo '$Revision: 1.226.2.37.2.35.2.51 $' . "\n"; exit(1); default: @@ -814,24 +814,6 @@ 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) { global $test_files, $exts_to_test, $ignored_by_ext, $exts_skipped, $exts_tested; @@ -1403,56 +1385,21 @@ // Check if test should be skipped. $info = ''; $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); - foreach ($labels as $label) { - if (in_array($label, array('SKIP_32', 'SKIP_64'))) { - continue; - } - if (isset($ini[$label]['skip']) && isset($ini[$label]['test'])) { - if (!in_array(basename($file), $ini[$label]['test'])) { - continue; - } - $code = '<?php '; - foreach ($ini[$label]['skip'] as $skip_file) { - $code .= 'require_once "'. $skip_file .'";'; - } - $skip_codes[$label] = $code; + + if (array_key_exists('SKIPIF', $section_text)) { + + if (trim($section_text['SKIPIF'])) { + show_file_block('skip', $section_text['SKIPIF']); + save_text($test_skipif, $section_text['SKIPIF'], $temp_skipif); + $extra = substr(PHP_OS, 0, 3) !== "WIN" ? + "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": ""; + + if ($leak_check) { + $env['USE_ZEND_ALLOC'] = '0'; + } else { + $env['USE_ZEND_ALLOC'] = '1'; } - } - } - 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); if (!$cfg['keep']['skip']) { @@ -1460,10 +1407,12 @@ } if (!strncasecmp('skip', ltrim($output), 4)) { - 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: '. $reason, $temp_filenames); + + if (preg_match('/^\s*skip\s*(.+)\s*/i', $output, $m)) { + show_result('SKIP', $tested, $tested_file, "reason: $m[1]", $temp_filenames); + } else { + show_result('SKIP', $tested, $tested_file, '', $temp_filenames); + } if (isset($old_php)) { $php = $old_php; http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/007.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/pcre/tests/007.phpt diff -u php-src/ext/pcre/tests/007.phpt:1.1.2.2 php-src/ext/pcre/tests/007.phpt:1.1.2.3 --- php-src/ext/pcre/tests/007.phpt:1.1.2.2 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/007.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,11 @@ --TEST-- 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-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/backtrack_limit.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/pcre/tests/backtrack_limit.phpt diff -u php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.2.2.1 php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.2.2.2 --- php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.2.2.1 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/backtrack_limit.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,11 @@ --TEST-- Backtracking limit +--SKIPIF-- +<?php +if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) { + die("skip no support for \p support PCRE library"); +} +?> --INI-- pcre.backtrack_limit=2 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug27103.phpt?r1=1.1.6.1.2.1&r2=1.1.6.1.2.2&diff_format=u Index: php-src/ext/pcre/tests/bug27103.phpt diff -u php-src/ext/pcre/tests/bug27103.phpt:1.1.6.1.2.1 php-src/ext/pcre/tests/bug27103.phpt:1.1.6.1.2.2 --- php-src/ext/pcre/tests/bug27103.phpt:1.1.6.1.2.1 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/bug27103.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,11 @@ --TEST-- 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-- <?php function iter($ar) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/invalid_utf8.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/pcre/tests/invalid_utf8.phpt diff -u php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.3.2.1 php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.3.2.2 --- php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.3.2.1 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/invalid_utf8.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,11 @@ --TEST-- preg_replace() and invalid UTF8 +--SKIPIF-- +<?php +if (@preg_match('/./u', '') === false) { + die('skip no utf8 support in PCRE library'); +} +?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/invalid_utf8_offset.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/pcre/tests/invalid_utf8_offset.phpt diff -u php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.1.2.2 php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.1.2.3 --- php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.1.2.2 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/invalid_utf8_offset.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,11 @@ --TEST-- preg_replace() and invalid UTF8 offset +--SKIPIF-- +<?php +if (@preg_match('/./u', '') === false) { + die('skip no utf8 support in PCRE library'); +} +?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/locales.phpt?r1=1.1.2.4.2.1&r2=1.1.2.4.2.2&diff_format=u Index: php-src/ext/pcre/tests/locales.phpt diff -u php-src/ext/pcre/tests/locales.phpt:1.1.2.4.2.1 php-src/ext/pcre/tests/locales.phpt:1.1.2.4.2.2 --- php-src/ext/pcre/tests/locales.phpt:1.1.2.4.2.1 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/locales.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,12 @@ --TEST-- Localized match +--SKIPIF-- +<?php + +if (!function_exists('setlocale')) die('skip: setlocale() not available'); +if ([EMAIL PROTECTED](LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese')) die('skip pt locale not available'); + +?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_anchored.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/pcre/tests/pcre_anchored.phpt diff -u php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.2.2.1 php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.2.2.2 --- php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.2.2.1 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/pcre_anchored.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,11 @@ --TEST-- 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-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace2.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/pcre/tests/preg_replace2.phpt diff -u php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.3.2.1 php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.3.2.2 --- php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.3.2.1 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/preg_replace2.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,11 @@ --TEST-- preg_replace() +--SKIPIF-- +<?php +if (@preg_match('/./u', '') === false) { + die('skip no utf8 support in PCRE library'); +} +?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/recursion_limit.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/pcre/tests/recursion_limit.phpt diff -u php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.2.2.1 php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.2.2.2 --- php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.2.2.1 Sun Nov 2 21:19:35 2008 +++ php-src/ext/pcre/tests/recursion_limit.phpt Mon Nov 3 13:07:28 2008 @@ -1,5 +1,11 @@ --TEST-- PCRE Recursion limit +--SKIPIF-- +<?php +if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) { + die("skip no support for \p support PCRE library"); +} +?> --INI-- pcre.recursion_limit=2 --FILE--
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php