mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFB: change run-tests.php to add %a

Browse Source
This commit is contained in:
Nuno Lopes 2007-09-14 15:36:29 +00:00
parent 619ddc2679
commit db5f5d6bd7
7 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/bz2/tests/005.phpt
View File

@ -38,10 +38,10 @@ var_dump(bzdecompress($data2));
echo "Done\n";
?>
--EXPECTF--
--EXPECTF--
Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d
NULL
string(%d) "BZ%s"
string(%d) "BZ%a"
int(-2)
int(-2)
int(-2)
@ -73,7 +73,7 @@ Done
--UEXPECTF--
Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d
NULL
unicode(%d) "BZ%s"
unicode(%d) "BZ%a"
int(-2)
int(-2)
int(-2)

18
ext/standard/tests/general_functions/phpcredits.phpt
View File

@ -17,28 +17,28 @@ var_dump(phpcredits(CREDITS_GROUP));
PHP Credits
PHP Group
%s
%a
Language Design & Concept
%s
%a
%wPHP Authors%w
%s
%a
%wSAPI Modules%w
%s
%a
%wModule Authors%w
%s
%a
%wPHP Documentation%w
%s
%a
PHP Quality Assurance Team
%s
%a
PHP Website Team
%s
%a
bool(true)
Warning: phpcredits() expects parameter 1 to be long, array given in %sphpcredits.php on line 4
@ -50,5 +50,5 @@ bool(true)
PHP Credits
PHP Group
%s
%a
bool(true)

15
ext/standard/tests/general_functions/phpinfo.phpt
View File

@ -24,6 +24,7 @@ Configure Command => %s
Server API => Command Line Interface
Virtual Directory Support => %s
Configuration File (php.ini) Path => %s
Loaded Configuration File => %s
PHP API => %d
PHP Extension => %d
Zend Extension => %d
@ -35,7 +36,7 @@ Registered PHP Streams => %s
Registered Stream Socket Transports => %s
Registered Stream Filters => %s
%s
%a
_______________________________________________________________________
@ -43,22 +44,22 @@ Configuration
PHP Core
%s
%a
Additional Modules
%s
%a
Environment
%s
%a
PHP Variables
%s
%a
PHP License
%s
%a
bool(true)
--
@ -71,5 +72,5 @@ bool(true)
phpinfo()
PHP License
%s
%a
bool(true)

4
ext/standard/tests/strings/sha1.phpt
View File

@ -44,8 +44,8 @@ bool(true)
string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709"
string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709"
bool(true)
string(20) "%s"
string(20) "%s"
string(20) "%a"
string(20) "%a"
Warning: sha1_file(%ssha1.dat): failed to open stream: No such file or directory in %s on line %d
Done

12
ext/zlib/tests/005.phpt
View File

@ -33,18 +33,18 @@ var_dump(gzuncompress((binary)$data2));
echo "Done\n";
?>
--EXPECTF--
--EXPECTF--
Warning: gzcompress() expects at least 1 parameter, 0 given in %s on line %d
NULL
Warning: gzcompress(): compression level (1000) must be within -1..9 in %s on line %d
bool(false)
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
string(%d) "%a"
string(%d) "%a"
string(%d) "%a"
string(%d) "%a"
string(%d) "%a"
Warning: gzuncompress() expects at least 1 parameter, 0 given in %s on line %d
NULL

10
ext/zlib/tests/006.phpt
View File

@ -40,11 +40,11 @@ NULL
Warning: gzdeflate(): compression level (1000) must be within -1..9 in %s on line %d
bool(false)
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
string(%d) "%s"
string(%d) "%a"
string(%d) "%a"
string(%d) "%a"
string(%d) "%a"
string(%d) "%a"
Warning: gzinflate() expects at least 1 parameter, 0 given in %s on line %d
NULL

17
run-tests.php
View File

@ -1550,14 +1550,15 @@ COMMAND $cmd
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
// Stick to basics
$wanted_re = str_replace("%e", '\\' . DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace("%s", ".+?", $wanted_re); //not greedy
$wanted_re = str_replace("%w", "\s*", $wanted_re);
$wanted_re = str_replace("%i", "[+\-]?[0-9]+", $wanted_re);
$wanted_re = str_replace("%d", "[0-9]+", $wanted_re);
$wanted_re = str_replace("%x", "[0-9a-fA-F]+", $wanted_re);
$wanted_re = str_replace("%f", "[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?", $wanted_re);
$wanted_re = str_replace("%c", ".", $wanted_re);
$wanted_re = str_replace('%e', '\\' . DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);
$wanted_re = str_replace('%a', '.+', $wanted_re);
$wanted_re = str_replace('%w', '\s*', $wanted_re);
$wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re);
$wanted_re = str_replace('%d', '\d+', $wanted_re);
$wanted_re = str_replace('%x', '[0-9a-fA-F]+', $wanted_re);
$wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:E-?\d+)?', $wanted_re);
$wanted_re = str_replace('%c', '.', $wanted_re);
// %f allows two points "-.0.0" but that is the best *simple* expression
}
/* DEBUG YOUR REGEX HERE