Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
On Wed, Jul 8, 2009 at 01:05, David Soria Parrad...@php.net wrote: dsp Tue Jul 7 23:05:18 2009 UTC Modified files: (Branch: PHP_5_3) /php-src run-tests.php Log: MFH: Reset TZ environment variable. Some tests assume that it's not set. Wasn't that feature completely removed in 5.3? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
dsp Tue Jul 7 23:05:18 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Reset TZ environment variable. Some tests assume that it's not set.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.67r2=1.226.2.37.2.35.2.68diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.67
php-src/run-tests.php:1.226.2.37.2.35.2.68
--- php-src/run-tests.php:1.226.2.37.2.35.2.67 Wed May 20 09:22:50 2009
+++ php-src/run-tests.php Tue Jul 7 23:05:17 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.67 2009/05/20 09:22:50 lbarnaud Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.68 2009/07/07 23:05:17 dsp 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
@@ -634,7 +634,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.67
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.68
$' . \n;
exit(1);
default:
@@ -1379,6 +1379,7 @@
$env['REQUEST_METHOD'] = '';
$env['CONTENT_TYPE']= '';
$env['CONTENT_LENGTH'] = '';
+ $env['TZ'] = '';
if (!empty($section_text['ENV'])) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
lbarnaudWed May 20 09:22:50 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: MFH: set default value of precision ini setting, many tests depend on this http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.66r2=1.226.2.37.2.35.2.67diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.66 php-src/run-tests.php:1.226.2.37.2.35.2.67 --- php-src/run-tests.php:1.226.2.37.2.35.2.66 Mon May 18 14:08:23 2009 +++ php-src/run-tests.php Wed May 20 09:22:50 2009 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.66 2009/05/18 14:08:23 bjori Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.67 2009/05/20 09:22:50 lbarnaud 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 @@ -230,6 +230,7 @@ 'auto_append_file=', 'magic_quotes_runtime=0', 'ignore_repeated_errors=0', + 'precision=14', 'unicode.runtime_encoding=ISO-8859-1', 'unicode.script_encoding=UTF-8', 'unicode.output_encoding=UTF-8', @@ -633,7 +634,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.66 $' . \n; + echo '$Revision: 1.226.2.37.2.35.2.67 $' . \n; exit(1); default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
bjori Mon May 18 14:08:23 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Print out the WARNed section
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.65r2=1.226.2.37.2.35.2.66diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.65
php-src/run-tests.php:1.226.2.37.2.35.2.66
--- php-src/run-tests.php:1.226.2.37.2.35.2.65 Sat Apr 25 17:12:40 2009
+++ php-src/run-tests.php Mon May 18 14:08:23 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.65 2009/04/25 17:12:40 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.66 2009/05/18 14:08:23 bjori 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
@@ -633,7 +633,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.65
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.66
$' . \n;
exit(1);
default:
@@ -2254,6 +2254,19 @@
$failed_test_summary .=
=\n;
}
+ if (count($PHP_FAILED_TESTS['WARNED'])) {
+ $failed_test_summary .= '
+=
+WARNED TEST SUMMARY
+-
+';
+ foreach ($PHP_FAILED_TESTS['WARNED'] as $failed_test_data) {
+ $failed_test_summary .= $failed_test_data['test_name']
. $failed_test_data['info'] . \n;
+ }
+
+ $failed_test_summary .=
=\n;
+ }
+
if (count($PHP_FAILED_TESTS['LEAKED'])) {
$failed_test_summary .= '
=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiSat Apr 25 17:12:40 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFB52: sync
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.64r2=1.226.2.37.2.35.2.65diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.64
php-src/run-tests.php:1.226.2.37.2.35.2.65
--- php-src/run-tests.php:1.226.2.37.2.35.2.64 Thu Apr 16 13:41:25 2009
+++ php-src/run-tests.php Sat Apr 25 17:12:40 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.64 2009/04/16 13:41:25 bjori Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.65 2009/04/25 17:12:40 jani 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
@@ -71,14 +71,15 @@
define(PHP_MAJOR_VERSION, $major);
}
-// __DIR__ and FILE_BINARY is available from 5.3.0
+// __DIR__ is available from 5.3.0
if (PHP_VERSION_ID 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
- define('FILE_BINARY', 0);
+ // FILE_BINARY is available from 5.2.7
+ if (PHP_VERSION_ID 50207) {
+ define('FILE_BINARY', 0);
+ }
}
-
-
// If timezone is not set, use UTC.
if (ini_get('date.timezone') == '') {
date_default_timezone_set('UTC');
@@ -632,7 +633,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.64
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.65
$' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
bjori Thu Apr 16 13:41:25 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Make it possible to run on 5.2
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.63r2=1.226.2.37.2.35.2.64diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.63
php-src/run-tests.php:1.226.2.37.2.35.2.64
--- php-src/run-tests.php:1.226.2.37.2.35.2.63 Thu Mar 12 20:42:46 2009
+++ php-src/run-tests.php Thu Apr 16 13:41:25 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.63 2009/03/12 20:42:46 zoe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.64 2009/04/16 13:41:25 bjori 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
@@ -59,11 +59,26 @@
exit;
}
-// __DIR__ is available from 5.3.0
+// Version constants only available as of 5.2.8
+if (!defined(PHP_VERSION_ID)) {
+ list($major, $minor, $bug) = explode(., phpversion(), 3);
+ $bug = (int)$bug; // Many distros make up their own versions
+ if ($bug 10) {
+ $bug = 0$bug;
+ }
+
+ define(PHP_VERSION_ID, {$major}0{$minor}$bug);
+ define(PHP_MAJOR_VERSION, $major);
+}
+
+// __DIR__ and FILE_BINARY is available from 5.3.0
if (PHP_VERSION_ID 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
+ define('FILE_BINARY', 0);
}
+
+
// If timezone is not set, use UTC.
if (ini_get('date.timezone') == '') {
date_default_timezone_set('UTC');
@@ -617,7 +632,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.63
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.64
$' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
zoe Thu Mar 12 20:42:46 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
refixing %r in run-tests.php (thanks iain lewis for the fix)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.62r2=1.226.2.37.2.35.2.63diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.62
php-src/run-tests.php:1.226.2.37.2.35.2.63
--- php-src/run-tests.php:1.226.2.37.2.35.2.62 Tue Mar 3 10:53:44 2009
+++ php-src/run-tests.php Thu Mar 12 20:42:46 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.62 2009/03/03 10:53:44 zoe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.63 2009/03/12 20:42:46 zoe 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.62
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.63
$' . \n;
exit(1);
default:
@@ -1738,32 +1738,32 @@
if (isset($section_text['EXPECTF'])) {
-// do preg_quote, but miss out any %r delimited sections
-$temp = ;
-$r = %r;
-$startOffset = 0;
-$length = strlen($wanted_re);
-while($startOffset $length) {
- $start = strpos($wanted_re, $r, $startOffset);
- if ($start !== false) {
-// we have found a start tag
-$end = strpos($wanted_re, $r, $start+2);
-if ($end === false) {
- // unbalanced tag, ignore it.
- $end = $start = $length;
-}
- } else {
-// no more %r sections
-$start = $end = $length;
- }
- // quote a non re portion of the string
- $temp = $temp . preg_quote(substr($wanted_re, $startOffset,
($start - $startOffset)), '/');
- // add the re unquoted.
- $temp = $temp . substr($wanted_re, $start+2, ($end -
$start-2));
- $startOffset = $end + 2;
-}
-$wanted_re = $temp;
-
+ // do preg_quote, but miss out any %r delimited sections
+ $temp = ;
+ $r = %r;
+ $startOffset = 0;
+ $length = strlen($wanted_re);
+ while($startOffset $length) {
+ $start = strpos($wanted_re, $r, $startOffset);
+ if ($start !== false) {
+ // we have found a start tag
+ $end = strpos($wanted_re, $r, $start+2);
+ if ($end === false) {
+ // unbalanced tag, ignore it.
+ $end = $start = $length;
+ }
+ } else {
+ // no more %r sections
+ $start = $end = $length;
+ }
+ // quote a non re portion of the string
+ $temp = $temp . preg_quote(substr($wanted_re,
$startOffset, ($start - $startOffset)), '/');
+ // add the re unquoted.
+ $temp = $temp . '(' . substr($wanted_re,
$start+2, ($end - $start-2)). ')';
+ $startOffset = $end + 2;
+ }
+ $wanted_re = $temp;
+
$wanted_re = str_replace(
array('%binary_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'binary string',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
zoe Tue Mar 3 10:53:44 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Added %r section
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.61r2=1.226.2.37.2.35.2.62diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.61
php-src/run-tests.php:1.226.2.37.2.35.2.62
--- php-src/run-tests.php:1.226.2.37.2.35.2.61 Mon Jan 5 11:14:43 2009
+++ php-src/run-tests.php Tue Mar 3 10:53:44 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.61 2009/01/05 11:14:43 tony2001 Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.62 2009/03/03 10:53:44 zoe 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.61
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.62
$' . \n;
exit(1);
default:
@@ -1737,7 +1737,33 @@
$wanted_re = preg_replace('/\r\n/', \n, $wanted);
if (isset($section_text['EXPECTF'])) {
- $wanted_re = preg_quote($wanted_re, '/');
+
+// do preg_quote, but miss out any %r delimited sections
+$temp = ;
+$r = %r;
+$startOffset = 0;
+$length = strlen($wanted_re);
+while($startOffset $length) {
+ $start = strpos($wanted_re, $r, $startOffset);
+ if ($start !== false) {
+// we have found a start tag
+$end = strpos($wanted_re, $r, $start+2);
+if ($end === false) {
+ // unbalanced tag, ignore it.
+ $end = $start = $length;
+}
+ } else {
+// no more %r sections
+$start = $end = $length;
+ }
+ // quote a non re portion of the string
+ $temp = $temp . preg_quote(substr($wanted_re, $startOffset,
($start - $startOffset)), '/');
+ // add the re unquoted.
+ $temp = $temp . substr($wanted_re, $start+2, ($end -
$start-2));
+ $startOffset = $end + 2;
+}
+$wanted_re = $temp;
+
$wanted_re = str_replace(
array('%binary_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'binary string',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
tony2001Mon Jan 5 11:14:44 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
fix ws
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.60r2=1.226.2.37.2.35.2.61diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.60
php-src/run-tests.php:1.226.2.37.2.35.2.61
--- php-src/run-tests.php:1.226.2.37.2.35.2.60 Mon Jan 5 09:19:09 2009
+++ php-src/run-tests.php Mon Jan 5 11:14:43 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.60 2009/01/05 09:19:09 tony2001 Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.61 2009/01/05 11:14:43 tony2001 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.60
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.61
$' . \n;
exit(1);
default:
@@ -1787,13 +1787,13 @@
}
if (!$leaked !$failed_headers) {
-if (isset($section_text['XFAIL'] )) {
-$warn = true;
- $info = (warn: XFAIL section but test
passes);
-}else {
- show_result(PASS, $tested, $tested_file, '',
$temp_filenames);
- return 'PASSED';
-}
+ if (isset($section_text['XFAIL'] )) {
+ $warn = true;
+ $info = (warn: XFAIL section but test
passes);
+ }else {
+ show_result(PASS, $tested,
$tested_file, '', $temp_filenames);
+ return 'PASSED';
+ }
}
}
@@ -1816,13 +1816,13 @@
}
if (!$leaked !$failed_headers) {
- if (isset($section_text['XFAIL'] )) {
-$warn = true;
- $info = (warn: XFAIL section but test
passes);
- }else {
- show_result(PASS, $tested, $tested_file, '',
$temp_filenames);
- return 'PASSED';
- }
+ if (isset($section_text['XFAIL'] )) {
+ $warn = true;
+ $info = (warn: XFAIL section but test
passes);
+ }else {
+ show_result(PASS, $tested,
$tested_file, '', $temp_filenames);
+ return 'PASSED';
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
tony2001Mon Jan 5 09:19:09 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: only add # original source if a redirect is active
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.59r2=1.226.2.37.2.35.2.60diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.59
php-src/run-tests.php:1.226.2.37.2.35.2.60
--- php-src/run-tests.php:1.226.2.37.2.35.2.59 Sun Jan 4 15:56:45 2009
+++ php-src/run-tests.php Mon Jan 5 09:19:09 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.59 2009/01/04 15:56:45 tony2001 Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.60 2009/01/05 09:19:09 tony2001 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.59
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.60
$' . \n;
exit(1);
default:
@@ -1870,7 +1870,9 @@
// write .diff
$diff = generate_diff($wanted, $wanted_re, $output);
- $diff = # original source file: $shortname\n . $diff;
+ if (is_array($IN_REDIRECT)) {
+ $diff = # original source file: $shortname\n . $diff;
+ }
show_file_block('diff', $diff);
if (strpos($log_format, 'D') !== false
file_put_contents($diff_filename, (binary) $diff, FILE_BINARY) === false) {
error(Cannot create test diff - $diff_filename);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
tony2001Sun Jan 4 15:56:45 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: fix PDO and other 'redirected' tests - add that # original source line
only if the test fails
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.58r2=1.226.2.37.2.35.2.59diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.58
php-src/run-tests.php:1.226.2.37.2.35.2.59
--- php-src/run-tests.php:1.226.2.37.2.35.2.58 Wed Dec 31 17:35:50 2008
+++ php-src/run-tests.php Sun Jan 4 15:56:45 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.58 2008/12/31 17:35:50 zoe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.59 2009/01/04 15:56:45 tony2001 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.58
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.59
$' . \n;
exit(1);
default:
@@ -1338,7 +1338,6 @@
if (is_array($IN_REDIRECT)) {
$tested = $IN_REDIRECT['prefix'] . ' ' .
trim($section_text['TEST']);
$tested_file = $tmp_relative_file;
- $section_text['FILE'] = # original source file: $shortname\n
. $section_text['FILE'];
}
// unlink old test results
@@ -1871,6 +1870,7 @@
// write .diff
$diff = generate_diff($wanted, $wanted_re, $output);
+ $diff = # original source file: $shortname\n . $diff;
show_file_block('diff', $diff);
if (strpos($log_format, 'D') !== false
file_put_contents($diff_filename, (binary) $diff, FILE_BINARY) === false) {
error(Cannot create test diff - $diff_filename);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
zoe Wed Dec 31 17:35:50 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Fixed bug #46845 Test expected to fail, but pass, don't cause error
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.57r2=1.226.2.37.2.35.2.58diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.57
php-src/run-tests.php:1.226.2.37.2.35.2.58
--- php-src/run-tests.php:1.226.2.37.2.35.2.57 Wed Dec 31 11:15:31 2008
+++ php-src/run-tests.php Wed Dec 31 17:35:50 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.57 2008/12/31 11:15:31 sebastian Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.58 2008/12/31 17:35:50 zoe 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.57
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.58
$' . \n;
exit(1);
default:
@@ -1786,9 +1786,15 @@
if (isset($old_php)) {
$php = $old_php;
}
+
if (!$leaked !$failed_headers) {
+if (isset($section_text['XFAIL'] )) {
+$warn = true;
+ $info = (warn: XFAIL section but test
passes);
+}else {
show_result(PASS, $tested, $tested_file, '',
$temp_filenames);
return 'PASSED';
+}
}
}
@@ -1811,8 +1817,13 @@
}
if (!$leaked !$failed_headers) {
+ if (isset($section_text['XFAIL'] )) {
+$warn = true;
+ $info = (warn: XFAIL section but test
passes);
+ }else {
show_result(PASS, $tested, $tested_file, '',
$temp_filenames);
return 'PASSED';
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
lstrojnyThu Dec 11 02:37:37 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Fixing strict warning when null is passed
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.55r2=1.226.2.37.2.35.2.56diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.55
php-src/run-tests.php:1.226.2.37.2.35.2.56
--- php-src/run-tests.php:1.226.2.37.2.35.2.55 Tue Dec 9 15:21:15 2008
+++ php-src/run-tests.php Thu Dec 11 02:37:36 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.55 2008/12/09 15:21:15 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.56 2008/12/11 02:37:36 lstrojny 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.55
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.56
$' . \n;
exit(1);
default:
@@ -1009,7 +1009,7 @@
$data = '';
$bin_env = array();
- foreach($env as $key = $value) {
+ foreach((array)$env as $key = $value) {
$bin_env[(binary)$key] = (binary)$value;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiTue Dec 9 15:21:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.54r2=1.226.2.37.2.35.2.55diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.54
php-src/run-tests.php:1.226.2.37.2.35.2.55
--- php-src/run-tests.php:1.226.2.37.2.35.2.54 Mon Dec 8 12:36:10 2008
+++ php-src/run-tests.php Tue Dec 9 15:21:15 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.54 2008/12/08 12:36:10 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.55 2008/12/09 15:21:15 jani 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
@@ -59,8 +59,8 @@
exit;
}
-// If __DIR__ is not defined, define it
-if (!defined('__DIR__')) {
+// __DIR__ is available from 5.3.0
+if (PHP_VERSION_ID 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
}
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.54
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.55
$' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiMon Dec 8 12:36:10 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- Sync with HEAD
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.53r2=1.226.2.37.2.35.2.54diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.53
php-src/run-tests.php:1.226.2.37.2.35.2.54
--- php-src/run-tests.php:1.226.2.37.2.35.2.53 Sat Dec 6 12:00:37 2008
+++ php-src/run-tests.php Mon Dec 8 12:36:10 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.53 2008/12/06 12:00:37 zoe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.54 2008/12/08 12:36:10 jani 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
@@ -59,6 +59,11 @@
exit;
}
+// If __DIR__ is not defined, define it
+if (!defined('__DIR__')) {
+ define('__DIR__', realpath(dirname(__FILE__)));
+}
+
// If timezone is not set, use UTC.
if (ini_get('date.timezone') == '') {
date_default_timezone_set('UTC');
@@ -612,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.53
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.54
$' . \n;
exit(1);
default:
@@ -1003,11 +1008,16 @@
$data = '';
+ $bin_env = array();
+ foreach($env as $key = $value) {
+ $bin_env[(binary)$key] = (binary)$value;
+ }
+
$proc = proc_open($commandline, array(
0 = array('pipe', 'r'),
1 = array('pipe', 'w'),
2 = array('pipe', 'w')
- ), $pipes, $cwd, $env, array('suppress_errors' = true,
'binary_pipes' = true));
+ ), $pipes, $cwd, $bin_env, array('suppress_errors' = true,
'binary_pipes' = true));
if (!$proc) {
return false;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
zoe Sat Dec 6 12:00:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
More changes to allow the same tests to be used with PHP5 and PHP6
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.52r2=1.226.2.37.2.35.2.53diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.52
php-src/run-tests.php:1.226.2.37.2.35.2.53
--- php-src/run-tests.php:1.226.2.37.2.35.2.52 Thu Nov 6 03:09:41 2008
+++ php-src/run-tests.php Sat Dec 6 12:00:37 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41 scottmac Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.53 2008/12/06 12:00:37 zoe 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.52
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.53
$' . \n;
exit(1);
default:
@@ -1730,6 +1730,11 @@
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
$wanted_re = str_replace(
+ array('%binary_string_optional%'),
+ version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'binary string',
+ $wanted_re
+ );
+ $wanted_re = str_replace(
array('%unicode_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'Unicode string',
$wanted_re
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
Like writing (talking) to walls it is. Repeat helps?
(no, this change was not MFH'd yet, AFAICT)
--Jani
Jani Taskinen wrote:
PLEASE keep the run-test.php in sync in PHP_5_2 also..
--Jani
Scott MacVicar wrote:
scottmacThu Nov 6 03:09:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php Log:
MFH: Support versions of valgrind from SVN. The version is shown as
3.4.0.SVN
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.51r2=1.226.2.37.2.35.2.52diff_format=u
Index: php-src/run-tests.php
diff -u 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.52
--- php-src/run-tests.php:1.226.2.37.2.35.2.51Mon Nov 3 13:07:28
2008
+++ php-src/run-tests.phpThu Nov 6 03:09:41 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28
felipe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41
scottmac 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
@@ -543,7 +543,7 @@
if (!$valgrind_header) {
error(Valgrind returned no version info,
cannot proceed.\nPlease check if Valgrind is installed.);
} else {
-$valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/,
'$1$2$3', $valgrind_header, 1, $replace_count);
+$valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)([.-]\w+)?(\s+)/,
'$1$2$3', $valgrind_header, 1, $replace_count);
if ($replace_count != 1 ||
!is_numeric($valgrind_version)) {
error(Valgrind returned invalid version
info (\$valgrind_header\), cannot proceed.);
}
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-echo '$Revision: 1.226.2.37.2.35.2.51 $' . \n;
+echo '$Revision: 1.226.2.37.2.35.2.52 $' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
Done now, even though its a 3 character change I'd call it a new
feature to support development versions of valgrind.
Scott
On 8 Nov 2008, at 02:02, Jani Taskinen wrote:
Like writing (talking) to walls it is. Repeat helps?
(no, this change was not MFH'd yet, AFAICT)
--Jani
Jani Taskinen wrote:
PLEASE keep the run-test.php in sync in PHP_5_2 also..
--Jani
Scott MacVicar wrote:
scottmacThu Nov 6 03:09:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php Log:
MFH: Support versions of valgrind from SVN. The version is shown
as 3.4.0.SVN
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.51r2=1.226.2.37.2.35.2.52diff_format=u
Index: php-src/run-tests.php
diff -u 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.52
--- php-src/run-tests.php:1.226.2.37.2.35.2.51Mon Nov 3
13:07:28 2008
+++ php-src/run-tests.phpThu Nov 6 03:09:41 2008
@@ -24,7 +24,7 @@
+
--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28
felipe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41
scottmac 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
@@ -543,7 +543,7 @@
if (!$valgrind_header) {
error(Valgrind returned no version info,
cannot proceed.\nPlease check if Valgrind is installed.);
} else {
-$valgrind_version = preg_replace(/
valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/, '$1$2$3',
$valgrind_header, 1, $replace_count);
+$valgrind_version = preg_replace(/
valgrind-([0-9])\.([0-9])\.([0-9]+)([.-]\w+)?(\s+)/, '$1$2$3',
$valgrind_header, 1, $replace_count);
if ($replace_count != 1 || !
is_numeric($valgrind_version)) {
error(Valgrind returned invalid
version info (\$valgrind_header\), cannot proceed.);
}
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-echo '$Revision: 1.226.2.37.2.35.2.51 $' .
\n;
+echo '$Revision: 1.226.2.37.2.35.2.52 $' .
\n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
PLEASE keep the run-test.php in sync in PHP_5_2 also..
--Jani
Scott MacVicar wrote:
scottmacThu Nov 6 03:09:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php
Log:
MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.51r2=1.226.2.37.2.35.2.52diff_format=u
Index: php-src/run-tests.php
diff -u 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.52
--- php-src/run-tests.php:1.226.2.37.2.35.2.51 Mon Nov 3 13:07:28 2008
+++ php-src/run-tests.php Thu Nov 6 03:09:41 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28 felipe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41 scottmac 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
@@ -543,7 +543,7 @@
if (!$valgrind_header) {
error(Valgrind returned no version
info, cannot proceed.\nPlease check if Valgrind is installed.);
} else {
- $valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/, '$1$2$3',
$valgrind_header, 1, $replace_count);
+ $valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)([.-]\w+)?(\s+)/, '$1$2$3',
$valgrind_header, 1, $replace_count);
if ($replace_count != 1 ||
!is_numeric($valgrind_version)) {
error(Valgrind returned invalid
version info (\$valgrind_header\), cannot proceed.);
}
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.51 $' .
\n;
+ echo '$Revision: 1.226.2.37.2.35.2.52 $' .
\n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
scottmacThu Nov 6 03:09:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.51r2=1.226.2.37.2.35.2.52diff_format=u
Index: php-src/run-tests.php
diff -u 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.52
--- php-src/run-tests.php:1.226.2.37.2.35.2.51 Mon Nov 3 13:07:28 2008
+++ php-src/run-tests.php Thu Nov 6 03:09:41 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28 felipe Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41 scottmac 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
@@ -543,7 +543,7 @@
if (!$valgrind_header) {
error(Valgrind returned no
version info, cannot proceed.\nPlease check if Valgrind is installed.);
} else {
- $valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/, '$1$2$3',
$valgrind_header, 1, $replace_count);
+ $valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)([.-]\w+)?(\s+)/, '$1$2$3',
$valgrind_header, 1, $replace_count);
if ($replace_count != 1 ||
!is_numeric($valgrind_version)) {
error(Valgrind
returned invalid version info (\$valgrind_header\), cannot proceed.);
}
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.51
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.52
$' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c /ext/ctype ctype.c /ext/curl interface.c /ext/da
Hello Felipe, please put the static back where it belongs. 5.3 is the only time where we can fix it. If someone complains, they should first understand waht we do here and second understand that we cannot change it extension after extension at random points in time. When putting it back, it might make sense to change the order to 'static const' rather than 'const static'. marcus Sunday, November 2, 2008, 10:19:41 PM, you wrote: felipe Sun Nov 2 21:19:41 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests skip.ini skip_001.inc skip_002.inc skip_003.inc Modified files: /php-srcrun-tests.php /ZendEngine2zend_API.h zend_builtin_functions.c zend_exceptions.c zend_interfaces.c /php-src/ext/bcmath bcmath.c /php-src/ext/bz2bz2.c /php-src/ext/calendar calendar.c /php-src/ext/com_dotnet com_extension.c /php-src/ext/ctype ctype.c /php-src/ext/curl interface.c /php-src/ext/date php_date.c /php-src/ext/dbadba.c /php-src/ext/domattr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c domimplementationsource.c domstringlist.c element.c entityreference.c namednodemap.c namelist.c node.c nodelist.c php_dom.c processinginstruction.c string_extend.c text.c xpath.c /php-src/ext/ereg ereg.c /php-src/ext/exif exif.c /php-src/ext/fileinfo fileinfo.c /php-src/ext/filter filter.c /php-src/ext/ftpphp_ftp.c /php-src/ext/gd gd.c /php-src/ext/gettextgettext.c /php-src/ext/gmpgmp.c /php-src/ext/hash hash.c /php-src/ext/iconv iconv.c /php-src/ext/imap php_imap.c /php-src/ext/interbase interbase.c /php-src/ext/intl php_intl.c /php-src/ext/intl/collator collator_class.c /php-src/ext/intl/dateformatdateformat_class.c /php-src/ext/intl/formatter formatter_class.c /php-src/ext/intl/localelocale_class.c /php-src/ext/intl/msgformat msgformat_class.c /php-src/ext/intl/normalizernormalizer_class.c /php-src/ext/json json.c /php-src/ext/ldap ldap.c /php-src/ext/libxml libxml.c /php-src/ext/mbstring mbstring.c /php-src/ext/mcrypt mcrypt.c /php-src/ext/msql php_msql.c /php-src/ext/mssql php_mssql.c /php-src/ext/mysqli mysqli_fe.c /php-src/ext/oci8 oci8.c /php-src/ext/odbc birdstep.c php_odbc.c /php-src/ext/opensslopenssl.c /php-src/ext/pcntl pcntl.c /php-src/ext/pcre php_pcre.c /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 /php-src/ext/pdopdo.c pdo_stmt.c /php-src/ext/pgsql pgsql.c /php-src/ext/phar phar_object.c /php-src/ext/posix posix.c /php-src/ext/pspell pspell.c /php-src/ext/readline readline.c /php-src/ext/recode recode.c /php-src/ext/reflection php_reflection.c /php-src/ext/sessionsession.c /php-src/ext/shmop shmop.c /php-src/ext/simplexml simplexml.c /php-src/ext/snmp snmp.c /php-src/ext/soap soap.c /php-src/ext/socketssockets.c /php-src/ext/splphp_spl.c spl_array.c spl_directory.c spl_dllist.c spl_fixedarray.c spl_heap.c spl_iterators.c spl_observer.c /php-src/ext/sqlite sqlite.c /php-src/ext/sqlite3sqlite3.c /php-src/ext/standard basic_functions.c user_filters.c /php-src/ext/sybase_ct php_sybase_ct.c /php-src/ext/sysvmsgsysvmsg.c /php-src/ext/sysvsemsysvsem.c /php-src/ext/sysvshmsysvshm.c /php-src/ext/tidy tidy.c /php-src/ext/tokenizer tokenizer.c /php-src/ext/wddx wddx.c /php-src/ext/xmlxml.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xmlrpc xmlrpc-epi-php.c /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xslxsltprocessor.c /php-src/ext/zipphp_zip.c /php-src/ext/zlib zlib.c /php-src/sapi/aolserver aolserver.c /php-src/sapi/apachephp_apache.c /php-src/sapi/apache2filter php_functions.c /php-src/sapi/apache2handler
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php /ext/pcre/tests 007.phpt backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt invalid_utf8_offset.phpt locales.phpt pcre_anchored.phpt preg_replace2.ph
felipe Mon Nov 3 13:07:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-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.50r2=1.226.2.37.2.35.2.51diff_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';
+
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c /ext/ctype ctype.c /ext/curl interface.c /ext/da
Felipe Pena wrote: felipe Sun Nov 2 21:19:41 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests skip.ini skip_001.inc skip_002.inc skip_003.inc Modified files: /php-src run-tests.php What does this run-tests.php change do here? Looks like you made the file out-of-sync now with HEAD and PHP_5_2.. --Jani /ZendEngine2 zend_API.h zend_builtin_functions.c zend_exceptions.c zend_interfaces.c /php-src/ext/bcmath bcmath.c /php-src/ext/bz2 bz2.c /php-src/ext/calendar calendar.c /php-src/ext/com_dotnet com_extension.c /php-src/ext/ctype ctype.c /php-src/ext/curl interface.c /php-src/ext/date php_date.c /php-src/ext/dba dba.c /php-src/ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c domimplementationsource.c domstringlist.c element.c entityreference.c namednodemap.c namelist.c node.c nodelist.c php_dom.c processinginstruction.c string_extend.c text.c xpath.c /php-src/ext/ereg ereg.c /php-src/ext/exif exif.c /php-src/ext/fileinfo fileinfo.c /php-src/ext/filter filter.c /php-src/ext/ftp php_ftp.c /php-src/ext/gd gd.c /php-src/ext/gettext gettext.c /php-src/ext/gmp gmp.c /php-src/ext/hash hash.c /php-src/ext/iconv iconv.c /php-src/ext/imap php_imap.c /php-src/ext/interbase interbase.c /php-src/ext/intl php_intl.c /php-src/ext/intl/collator collator_class.c /php-src/ext/intl/dateformat dateformat_class.c /php-src/ext/intl/formatter formatter_class.c /php-src/ext/intl/locale locale_class.c /php-src/ext/intl/msgformat msgformat_class.c /php-src/ext/intl/normalizer normalizer_class.c /php-src/ext/json json.c /php-src/ext/ldap ldap.c /php-src/ext/libxml libxml.c /php-src/ext/mbstring mbstring.c /php-src/ext/mcrypt mcrypt.c /php-src/ext/msql php_msql.c /php-src/ext/mssql php_mssql.c /php-src/ext/mysqli mysqli_fe.c /php-src/ext/oci8 oci8.c /php-src/ext/odbc birdstep.c php_odbc.c /php-src/ext/openssl openssl.c /php-src/ext/pcntl pcntl.c /php-src/ext/pcre php_pcre.c /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 /php-src/ext/pdo pdo.c pdo_stmt.c /php-src/ext/pgsql pgsql.c /php-src/ext/phar phar_object.c /php-src/ext/posix posix.c /php-src/ext/pspell pspell.c /php-src/ext/readline readline.c /php-src/ext/recode recode.c /php-src/ext/reflection php_reflection.c /php-src/ext/session session.c /php-src/ext/shmop shmop.c /php-src/ext/simplexml simplexml.c /php-src/ext/snmp snmp.c /php-src/ext/soap soap.c /php-src/ext/sockets sockets.c /php-src/ext/spl php_spl.c spl_array.c spl_directory.c spl_dllist.c spl_fixedarray.c spl_heap.c spl_iterators.c spl_observer.c /php-src/ext/sqlite sqlite.c /php-src/ext/sqlite3 sqlite3.c /php-src/ext/standard basic_functions.c user_filters.c /php-src/ext/sybase_ct php_sybase_ct.c /php-src/ext/sysvmsg sysvmsg.c /php-src/ext/sysvsem sysvsem.c /php-src/ext/sysvshm sysvshm.c /php-src/ext/tidy tidy.c /php-src/ext/tokenizer tokenizer.c /php-src/ext/wddx wddx.c /php-src/ext/xml xml.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xmlrpc xmlrpc-epi-php.c /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xsl xsltprocessor.c /php-src/ext/zip php_zip.c /php-src/ext/zlib zlib.c /php-src/sapi/aolserver aolserver.c /php-src/sapi/apache php_apache.c /php-src/sapi/apache2filter php_functions.c /php-src/sapi/apache2handler php_functions.c /php-src/sapi/apache_hooks php_apache.c /php-src/sapi/milter php_milter.c /php-src/sapi/nsapi nsapi.c Log: - Revert ZEND_BEGIN_ARG_INFO change -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c /ext/ctype ctype.c /ext/curl interface.c /ext/dat
Em Seg, 2008-11-03 às 14:39 +0200, Jani Taskinen escreveu: Felipe Pena wrote: felipe Sun Nov 2 21:19:41 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests skip.ini skip_001.inc skip_002.inc skip_003.inc Modified files: /php-srcrun-tests.php What does this run-tests.php change do here? Looks like you made the file out-of-sync now with HEAD and PHP_5_2.. Arghhh, reverted... Thanks ;-) -- Regards, Felipe Pena -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
johannesSun Oct 19 18:05:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Add %S and %A to EXPECTF, they work like %s and %a but match empty strings,
too
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.48r2=1.226.2.37.2.35.2.49diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.48
php-src/run-tests.php:1.226.2.37.2.35.2.49
--- php-src/run-tests.php:1.226.2.37.2.35.2.48 Tue Sep 30 13:21:48 2008
+++ php-src/run-tests.php Sun Oct 19 18:05:43 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.48 2008/09/30 13:21:48 rrichards Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.49 2008/10/19 18:05:43 johannes 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.48
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.49
$' . \n;
exit(1);
default:
@@ -1747,7 +1747,9 @@
// Stick to basics
$wanted_re = str_replace('%e', '\\' .
DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);
+ $wanted_re = str_replace('%S', '[^\r\n]*', $wanted_re);
$wanted_re = str_replace('%a', '.+', $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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
rrichards Tue Sep 30 13:21:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Windows requires SystemRoot env var to run tests
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.47r2=1.226.2.37.2.35.2.48diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.47
php-src/run-tests.php:1.226.2.37.2.35.2.48
--- php-src/run-tests.php:1.226.2.37.2.35.2.47 Fri Sep 12 14:15:05 2008
+++ php-src/run-tests.php Tue Sep 30 13:21:48 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.47 2008/09/12 14:15:05 lbarnaud Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.48 2008/09/30 13:21:48 rrichards 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
@@ -111,6 +111,9 @@
}
$environment = isset($_ENV) ? $_ENV : array();
+if ((substr(PHP_OS, 0, 3) == WIN) empty($environment[SystemRoot])) {
+ $environment[SystemRoot] = getenv(SystemRoot);
+}
// Don't ever guess at the PHP executable location.
// Require the explicit specification.
@@ -609,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.47
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.48
$' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
lbarnaudFri Sep 12 14:15:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Fix cwd when running tests out of tree with ZTS builds (fixes #45837)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.46r2=1.226.2.37.2.35.2.47diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.46
php-src/run-tests.php:1.226.2.37.2.35.2.47
--- php-src/run-tests.php:1.226.2.37.2.35.2.46 Mon Sep 8 09:23:51 2008
+++ php-src/run-tests.php Fri Sep 12 14:15:05 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.46 2008/09/08 09:23:51 lbarnaud Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.47 2008/09/12 14:15:05 lbarnaud 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
@@ -609,7 +609,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.46
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.47
$' . \n;
exit(1);
default:
@@ -996,7 +996,7 @@
function system_with_timeout($commandline, $env = null, $stdin = null)
{
- global $leak_check;
+ global $leak_check, $cwd;
$data = '';
@@ -1004,7 +1004,7 @@
0 = array('pipe', 'r'),
1 = array('pipe', 'w'),
2 = array('pipe', 'w')
- ), $pipes, null, $env, array('suppress_errors' = true,
'binary_pipes' = true));
+ ), $pipes, $cwd, $env, array('suppress_errors' = true,
'binary_pipes' = true));
if (!$proc) {
return false;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
lbarnaudMon Sep 8 09:23:51 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: run-tests.php: Added %u|b% placeholder, like %unicode|string%, for
array keys in var_dump() output.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.45r2=1.226.2.37.2.35.2.46diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.45
php-src/run-tests.php:1.226.2.37.2.35.2.46
--- php-src/run-tests.php:1.226.2.37.2.35.2.45 Sat Aug 30 11:25:34 2008
+++ php-src/run-tests.php Mon Sep 8 09:23:51 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.45 2008/08/30 11:25:34 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.46 2008/09/08 09:23:51 lbarnaud 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
@@ -609,7 +609,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.45
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.46
$' . \n;
exit(1);
default:
@@ -1736,6 +1736,11 @@
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'unicode',
$wanted_re
);
+ $wanted_re = str_replace(
+ array('%u\|b%', '%b\|u%'),
+ version_compare(PHP_VERSION, '6.0.0-dev') == -1
? '' : 'u',
+ $wanted_re
+ );
// Stick to basics
$wanted_re = str_replace('%e', '\\' .
DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
helly Sat Aug 30 11:25:34 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- MFH Fix -p handling
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.44r2=1.226.2.37.2.35.2.45diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.44
php-src/run-tests.php:1.226.2.37.2.35.2.45
--- php-src/run-tests.php:1.226.2.37.2.35.2.44 Fri Aug 29 10:25:54 2008
+++ php-src/run-tests.php Sat Aug 30 11:25:34 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.44 2008/08/29 10:25:54 felixdv Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.45 2008/08/30 11:25:34 helly 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
@@ -559,6 +559,7 @@
case 'p':
$php = $argv[++$i];
putenv(TEST_PHP_EXECUTABLE=$php);
+ $environment['TEST_PHP_EXECUTABLE'] =
$php;
break;
case 'q':
putenv('NO_INTERACTION=1');
@@ -608,7 +609,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.44
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.45
$' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
felixdv Fri Aug 29 10:25:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Added %unicode_string_optional% for differences in output between PHP 5 and 6
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.43r2=1.226.2.37.2.35.2.44diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.43
php-src/run-tests.php:1.226.2.37.2.35.2.44
--- php-src/run-tests.php:1.226.2.37.2.35.2.43 Thu Aug 14 20:53:56 2008
+++ php-src/run-tests.php Fri Aug 29 10:25:54 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.43 2008/08/14 20:53:56 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.44 2008/08/29 10:25:54 felixdv 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
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.43
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.44
$' . \n;
exit(1);
default:
@@ -1726,6 +1726,11 @@
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
$wanted_re = str_replace(
+ array('%unicode_string_optional%'),
+ version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'Unicode string',
+ $wanted_re
+ );
+ $wanted_re = str_replace(
array('%unicode\|string%', '%string\|unicode%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'unicode',
$wanted_re
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiThu Aug 14 20:53:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Silencio for some unnecessary errors
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.42r2=1.226.2.37.2.35.2.43diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.42
php-src/run-tests.php:1.226.2.37.2.35.2.43
--- php-src/run-tests.php:1.226.2.37.2.35.2.42 Tue Aug 5 16:25:42 2008
+++ php-src/run-tests.php Thu Aug 14 20:53:56 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.42 2008/08/05 16:25:42 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.43 2008/08/14 20:53:56 jani 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
@@ -389,7 +389,7 @@
}
$failed_tests_data .= $sep . PHPINFO . $sep;
- $failed_tests_data .= shell_exec($php . '
-dhtml_errors=0 -i');
+ $failed_tests_data .= shell_exec($php . '
-ddisplay_errors=stderr -dhtml_errors=0 -i 2 /dev/null');
if ($just_save_results ||
!mail_qa_team($failed_tests_data, $compression, $status)) {
file_put_contents($output_file,
$failed_tests_data);
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.42
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.43
$' . \n;
exit(1);
default:
@@ -1560,7 +1560,7 @@
}
save_text($tmp_post, $request);
- $cmd = $php$pass_options$ini_settings -f \$test_file\ 21
$tmp_post;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\ 21
$tmp_post;
} else if (array_key_exists('POST', $section_text)
!empty($section_text['POST'])) {
@@ -1581,7 +1581,7 @@
$env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
$env['CONTENT_LENGTH'] = $content_length;
- $cmd = $php$pass_options$ini_settings -f \$test_file\ 21
$tmp_post;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\ 21
$tmp_post;
} else {
@@ -1589,7 +1589,7 @@
$env['CONTENT_TYPE'] = '';
$env['CONTENT_LENGTH'] = '';
- $cmd = $php$pass_options$ini_settings -f \$test_file\ $args
21;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\
$args 21;
}
if ($leak_check) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiTue Aug 5 16:25:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.41r2=1.226.2.37.2.35.2.42diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.41
php-src/run-tests.php:1.226.2.37.2.35.2.42
--- php-src/run-tests.php:1.226.2.37.2.35.2.41 Sat Aug 2 13:39:42 2008
+++ php-src/run-tests.php Tue Aug 5 16:25:42 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.41 2008/08/02 13:39:42 felipe Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.42 2008/08/05 16:25:42 jani 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
@@ -231,7 +231,7 @@
settings2array($ini_overwrites, $info_params);
settings2params($info_params);
$php_info = `$php $pass_options $info_params $info_file`;
- define('TESTED_PHP_VERSION', `$php -r echo PHP_VERSION;`);
+ define('TESTED_PHP_VERSION', `$php -n -r echo PHP_VERSION;`);
if ($php_cgi $php != $php_cgi) {
$php_info_cgi = `$php_cgi $pass_options $info_params -q
$info_file`;
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.41
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.42
$' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
felipe Sat Aug 2 13:39:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- MFH: Fixed undefined variable
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.40r2=1.226.2.37.2.35.2.41diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.40
php-src/run-tests.php:1.226.2.37.2.35.2.41
--- php-src/run-tests.php:1.226.2.37.2.35.2.40 Fri Jul 25 09:55:45 2008
+++ php-src/run-tests.php Sat Aug 2 13:39:42 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.40 2008/07/25 09:55:45 tony2001 Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.41 2008/08/02 13:39:42 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
@@ -284,7 +284,7 @@
function save_or_mail_results()
{
global $sum_results, $just_save_results, $failed_test_summary,
- $PHP_FAILED_TESTS, $CUR_DIR, $php, $output_file;
+ $PHP_FAILED_TESTS, $CUR_DIR, $php, $output_file, $compression;
/* We got failed Tests, offer the user to send an e-mail to QA team,
unless NO_INTERACTION is set */
if (!getenv('NO_INTERACTION')) {
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.40
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.41
$' . \n;
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
moriyoshi Fri Jul 25 09:32:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- MFH: Allow the results of a partial run to be saved when -s option is
explicitly specified.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.38r2=1.226.2.37.2.35.2.39diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.38
php-src/run-tests.php:1.226.2.37.2.35.2.39
--- php-src/run-tests.php:1.226.2.37.2.35.2.38 Wed Jul 23 16:11:00 2008
+++ php-src/run-tests.php Fri Jul 25 09:32:23 2008
@@ -24,12 +24,13 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.38 2008/07/23 16:11:00 lstrojny Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.39 2008/07/25 09:32:23 moriyoshi 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
* not run without it.
*/
+
if (!extension_loaded('pcre')) {
echo NO_PCRE_ERROR
@@ -277,6 +278,135 @@
;
}
+define('PHP_QA_EMAIL', '[EMAIL PROTECTED]');
+define('QA_SUBMISSION_PAGE', 'http://qa.php.net/buildtest-process.php');
+
+function save_or_mail_results()
+{
+ global $sum_results, $just_save_results, $failed_test_summary,
+ $PHP_FAILED_TESTS, $CUR_DIR, $php, $output_file;
+
+ /* We got failed Tests, offer the user to send an e-mail to QA team,
unless NO_INTERACTION is set */
+ if (!getenv('NO_INTERACTION')) {
+ $fp = fopen(php://stdin, r+);
+ if ($sum_results['FAILED'] || $sum_results['BORKED'] ||
$sum_results['WARNED'] || $sum_results['LEAKED'] || $sum_results['XFAILED']) {
+ echo \nYou may have found a problem in PHP.;
+ }
+ echo \nWe would like to send this report automatically to
the\n;
+ echo PHP QA team, to give us a better understanding of
how\nthe test cases are doing. If you don't want to send it\n;
+ echo immediately, you can choose \s\ to save the report
to\na file that you can send us later.\n;
+ echo Do you want to send this report now? [Yns]: ;
+ flush();
+
+ $user_input = fgets($fp, 10);
+ $just_save_results = (strtolower($user_input[0]) == 's');
+ }
+
+ if ($just_save_results || !getenv('NO_INTERACTION')) {
+ if ($just_save_results || strlen(trim($user_input)) == 0 ||
strtolower($user_input[0]) == 'y') {
+ /*
+* Collect information about the host system for our
report
+* Fetch phpinfo() output so that we can see the PHP
enviroment
+* Make an archive of all the failed tests
+* Send an email
+*/
+ if ($just_save_results) {
+ $user_input = 's';
+ }
+
+ /* Ask the user to provide an email address, so that QA
team can contact the user */
+ if (!strncasecmp($user_input, 'y', 1) ||
strlen(trim($user_input)) == 0) {
+ echo \nPlease enter your email address.\n(Your
address will be mangled so that it will not go out on any\nmailinglist in plain
text): ;
+ flush();
+ $user_email = trim(fgets($fp, 1024));
+ $user_email = str_replace(@, at ,
str_replace(., dot , $user_email));
+ }
+
+ $failed_tests_data = '';
+ $sep = \n . str_repeat('=', 80) . \n;
+ $failed_tests_data .= $failed_test_summary . \n;
+ $failed_tests_data .= get_summary(true, false) . \n;
+
+ if ($sum_results['FAILED']) {
+ foreach ($PHP_FAILED_TESTS['FAILED'] as
$test_info) {
+ $failed_tests_data .= $sep .
$test_info['name'] . $test_info['info'];
+ $failed_tests_data .= $sep .
file_get_contents(realpath($test_info['output']));
+ $failed_tests_data .= $sep .
file_get_contents(realpath($test_info['diff']));
+ $failed_tests_data .= $sep . \n\n;
+ }
+ $status = failed;
+ } else {
+ $status = success;
+ }
+
+ $failed_tests_data .= \n . $sep . 'BUILD ENVIRONMENT'
. $sep;
+ $failed_tests_data .= OS:\n . PHP_OS . - .
php_uname() . \n\n;
+ $ldd = $autoconf =
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
tony2001Fri Jul 25 09:55:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: fix typo http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.39r2=1.226.2.37.2.35.2.40diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.39 php-src/run-tests.php:1.226.2.37.2.35.2.40 --- php-src/run-tests.php:1.226.2.37.2.35.2.39 Fri Jul 25 09:32:23 2008 +++ php-src/run-tests.php Fri Jul 25 09:55:45 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.39 2008/07/25 09:32:23 moriyoshi Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.40 2008/07/25 09:55:45 tony2001 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 @@ -426,7 +426,7 @@ $output_file = 'compress.zlib://' . $output_file . '.gz'; } -$jnust_save_results = false; +$just_save_results = false; $leak_check = false; $html_output = false; $html_file = null; @@ -608,7 +608,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.39 $' . \n; + echo '$Revision: 1.226.2.37.2.35.2.40 $' . \n; exit(1); default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
lstrojnyWed Jul 23 16:11:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Allowing %unicode|string% as a placeholder (backport from HEAD)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.37r2=1.226.2.37.2.35.2.38diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.37
php-src/run-tests.php:1.226.2.37.2.35.2.38
--- php-src/run-tests.php:1.226.2.37.2.35.2.37 Tue Jul 22 19:59:37 2008
+++ php-src/run-tests.php Wed Jul 23 16:11:00 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.37 2008/07/22 19:59:37 felipe Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.38 2008/07/23 16:11:00 lstrojny 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
@@ -478,7 +478,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.37
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.38
$' . \n;
exit(1);
default:
@@ -1711,6 +1711,11 @@
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
+ $wanted_re = str_replace(
+ array('%unicode\|string%', '%string\|unicode%'),
+ version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'unicode',
+ $wanted_re
+ );
// Stick to basics
$wanted_re = str_replace('%e', '\\' .
DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
sfoxTue Jul 22 09:35:55 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: MFH Add missing help text http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.35r2=1.226.2.37.2.35.2.36diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.35 php-src/run-tests.php:1.226.2.37.2.35.2.36 --- php-src/run-tests.php:1.226.2.37.2.35.2.35 Mon Jul 21 16:08:15 2008 +++ php-src/run-tests.php Tue Jul 22 09:35:55 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.35 2008/07/21 16:08:15 jani Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.36 2008/07/22 09:35:55 sfox 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 @@ -478,7 +478,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.35 $' . \n; + echo '$Revision: 1.226.2.37.2.35.2.36 $' . \n; exit(1); default: @@ -517,7 +517,7 @@ -s file Write output to file. --x FIXME: STEPH WRITES THE HELP TEXT HERE!! +-x Sets 'SKIP_SLOW_TESTS' environmental variable. --verbose -v Verbose mode. @@ -539,8 +539,10 @@ Do not delete 'all' files, 'php' test file, 'skip' or 'clean' file. ---set-timeout -FIXME: STEPH WRITES THE HELP TEXT HERE!! +--set-timeout [n] +Set timeout for individual tests, where [n] is the number of +seconds. The default value is 60 seconds, or 300 seconds when +testing for memory leaks. --show-[all|php|skip|clean|exp|diff|out] Show 'all' files, 'php' test file, 'skip' or 'clean' file. You -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
felipe Tue Jul 22 19:59:38 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: - MFH: The error level must be E_ALL | E_STRICT. http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.36r2=1.226.2.37.2.35.2.37diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.36 php-src/run-tests.php:1.226.2.37.2.35.2.37 --- php-src/run-tests.php:1.226.2.37.2.35.2.36 Tue Jul 22 09:35:55 2008 +++ php-src/run-tests.php Tue Jul 22 19:59:37 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.36 2008/07/22 09:35:55 sfox Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.37 2008/07/22 19:59:37 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 @@ -189,7 +189,7 @@ 'safe_mode=0', 'disable_functions=', 'output_buffering=Off', - 'error_reporting=' . ((PHP_MAJOR_VERSION == 5) ? '32767' : '30719'), + 'error_reporting=' . (E_ALL | E_STRICT), 'display_errors=1', 'display_startup_errors=1', 'log_errors=0', @@ -478,7 +478,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.36 $' . \n; + echo '$Revision: 1.226.2.37.2.35.2.37 $' . \n; exit(1); default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
bjori Mon Jul 21 09:59:37 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: Run the tests with E_STRICT again # Why isn't E_STRICT in E_ALL? http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.31r2=1.226.2.37.2.35.2.32diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.31 php-src/run-tests.php:1.226.2.37.2.35.2.32 --- php-src/run-tests.php:1.226.2.37.2.35.2.31 Mon Jul 21 09:40:59 2008 +++ php-src/run-tests.php Mon Jul 21 09:59:37 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.31 2008/07/21 09:40:59 bjori Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.32 2008/07/21 09:59:37 bjori 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 @@ -177,7 +177,7 @@ 'safe_mode=0', 'disable_functions=', 'output_buffering=Off', - 'error_reporting=30719', + 'error_reporting=32767', 'display_errors=1', 'display_startup_errors=1', 'log_errors=0', @@ -449,7 +449,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.31 $'.\n; + echo '$Revision: 1.226.2.37.2.35.2.32 $'.\n; exit(1); case 'u': -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiMon Jul 21 10:48:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Stupid WS fixes..Thanks Steph!
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.32r2=1.226.2.37.2.35.2.33diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.32
php-src/run-tests.php:1.226.2.37.2.35.2.33
--- php-src/run-tests.php:1.226.2.37.2.35.2.32 Mon Jul 21 09:59:37 2008
+++ php-src/run-tests.php Mon Jul 21 10:48:31 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.32 2008/07/21 09:59:37 bjori Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.33 2008/07/21 10:48:31 jani 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
@@ -109,20 +109,23 @@
// Require the explicit specification.
// Otherwise we could end up testing the wrong file!
-$php = NULL;
-$php_cgi = NULL;
+$php = null;
+$php_cgi = null;
if (getenv('TEST_PHP_EXECUTABLE')) {
$php = getenv('TEST_PHP_EXECUTABLE');
+
if ($php=='auto') {
$php = $cwd.'/sapi/cli/php';
putenv(TEST_PHP_EXECUTABLE=$php);
+
if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
$php_cgi = $cwd.'/sapi/cgi/php-cgi';
+
if (file_exists($php_cgi)) {
putenv(TEST_PHP_CGI_EXECUTABLE=$php_cgi);
} else {
- $php_cgi = NULL;
+ $php_cgi = null;
}
}
}
@@ -131,10 +134,12 @@
if (getenv('TEST_PHP_CGI_EXECUTABLE')) {
$php_cgi = getenv('TEST_PHP_CGI_EXECUTABLE');
+
if ($php_cgi=='auto') {
$php_cgi = $cwd.'/sapi/cgi/php-cgi';
putenv(TEST_PHP_CGI_EXECUTABLE=$php_cgi);
}
+
$environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
}
@@ -145,6 +150,7 @@
if (empty($php) || !file_exists($php)) {
error(environment variable TEST_PHP_EXECUTABLE must be set to
specify PHP executable!);
}
+
if (function_exists('is_executable') [EMAIL PROTECTED]($php)) {
error(invalid PHP executable specified by TEST_PHP_EXECUTABLE
= . $php);
}
@@ -165,7 +171,7 @@
// Check whether user test dirs are requested.
if (getenv('TEST_PHP_USER')) {
- $user_tests = explode (',', getenv('TEST_PHP_USER'));
+ $user_tests = explode (', ', getenv('TEST_PHP_USER'));
} else {
$user_tests = array();
}
@@ -211,10 +217,11 @@
More .INIs : . (function_exists(\'php_ini_scanned_files\') ?
str_replace(\n,, php_ini_scanned_files()) : ** not determined **); ?';
save_text($info_file, $php_info);
$info_params = array();
- settings2array($ini_overwrites,$info_params);
+ settings2array($ini_overwrites, $info_params);
settings2params($info_params);
$php_info = `$php $pass_options $info_params $info_file`;
define('TESTED_PHP_VERSION', `$php -r echo PHP_VERSION;`);
+
if ($php_cgi $php != $php_cgi) {
$php_info_cgi = `$php_cgi $pass_options $info_params -q
$info_file`;
$php_info_sep =
\n-;
@@ -235,11 +242,13 @@
'xdebug' = array('xdebug.default_enable=0'),
'mbstring' = array('mbstring.func_overload=0'),
);
+
foreach($info_params_ex as $ext = $ini_overwrites_ex) {
if (in_array($ext, $exts_to_test)) {
$ini_overwrites = array_merge($ini_overwrites,
$ini_overwrites_ex);
}
}
+
@unlink($info_file);
// Write test context information.
@@ -271,9 +280,11 @@
$compression = 0;
$output_file = $CUR_DIR . '/php_test_results_' . @date('Ymd_Hi') . '.txt';
+
if ($compression) {
$output_file = 'compress.zlib://' . $output_file . '.gz';
}
+
$just_save_results = false;
$leak_check = false;
$html_output = false;
@@ -287,38 +298,45 @@
$cfgtypes = array('show', 'keep');
$cfgfiles = array('skip', 'php', 'clean', 'out', 'diff', 'exp');
$cfg = array();
+
foreach($cfgtypes as $type) {
$cfg[$type] = array();
+
foreach($cfgfiles as $file) {
$cfg[$type][$file] = false;
}
}
-if (getenv('TEST_PHP_ARGS'))
-{
- if (!isset($argc) || !$argc || !isset($argv))
- {
+if (getenv('TEST_PHP_ARGS')) {
+
+ if (!isset($argc) || !$argc || !isset($argv)) {
$argv = array(__FILE__);
}
+
$argv = array_merge($argv, split(' ', getenv('TEST_PHP_ARGS')));
$argc = count($argv);
}
if (isset($argc) $argc 1) {
+
for ($i=1;
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiMon Jul 21 11:05:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- More stupid WS etc fixes. Plus the missing help text place holders for
Steph to fill up..
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.33r2=1.226.2.37.2.35.2.34diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.33
php-src/run-tests.php:1.226.2.37.2.35.2.34
--- php-src/run-tests.php:1.226.2.37.2.35.2.33 Mon Jul 21 10:48:31 2008
+++ php-src/run-tests.php Mon Jul 21 11:05:23 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.33 2008/07/21 10:48:31 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.34 2008/07/21 11:05:23 jani 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
@@ -116,11 +116,11 @@
$php = getenv('TEST_PHP_EXECUTABLE');
if ($php=='auto') {
- $php = $cwd.'/sapi/cli/php';
+ $php = $cwd . '/sapi/cli/php';
putenv(TEST_PHP_EXECUTABLE=$php);
if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
- $php_cgi = $cwd.'/sapi/cgi/php-cgi';
+ $php_cgi = $cwd . '/sapi/cgi/php-cgi';
if (file_exists($php_cgi)) {
putenv(TEST_PHP_CGI_EXECUTABLE=$php_cgi);
@@ -136,7 +136,7 @@
$php_cgi = getenv('TEST_PHP_CGI_EXECUTABLE');
if ($php_cgi=='auto') {
- $php_cgi = $cwd.'/sapi/cgi/php-cgi';
+ $php_cgi = $cwd . '/sapi/cgi/php-cgi';
putenv(TEST_PHP_CGI_EXECUTABLE=$php_cgi);
}
@@ -171,7 +171,7 @@
// Check whether user test dirs are requested.
if (getenv('TEST_PHP_USER')) {
- $user_tests = explode (', ', getenv('TEST_PHP_USER'));
+ $user_tests = explode (',', getenv('TEST_PHP_USER'));
} else {
$user_tests = array();
}
@@ -209,12 +209,12 @@
$info_file = __DIR__ . '/run-test-info.php';
@unlink($info_file);
$php_info = '?php echo
-PHP_SAPI: . PHP_SAPI .
-PHP_VERSION : . phpversion() .
-ZEND_VERSION: . zend_version() .
-PHP_OS : . PHP_OS . - . php_uname() .
-INI actual : . realpath(get_cfg_var(cfg_file_path)) .
-More .INIs : . (function_exists(\'php_ini_scanned_files\') ?
str_replace(\n,, php_ini_scanned_files()) : ** not determined **); ?';
+PHP_SAPI: , PHP_SAPI ,
+PHP_VERSION : , phpversion() ,
+ZEND_VERSION: , zend_version() ,
+PHP_OS : , PHP_OS , - , php_uname() ,
+INI actual : , realpath(get_cfg_var(cfg_file_path)) ,
+More .INIs : , (function_exists(\'php_ini_scanned_files\') ?
str_replace(\n,, php_ini_scanned_files()) : ** not determined **); ?';
save_text($info_file, $php_info);
$info_params = array();
settings2array($ini_overwrites, $info_params);
@@ -229,10 +229,11 @@
} else {
$php_cgi_info = '';
}
+
@unlink($info_file);
// load list of enabled extensions
- save_text($info_file, '?php echo join(,,get_loaded_extensions());
?');
+ save_text($info_file, '?php echo join(,, get_loaded_extensions());
?');
$exts_to_test = explode(',',`$php $pass_options $info_params
$info_file`);
// check for extensions that need special handling and regenerate
$info_params_ex = array(
@@ -336,7 +337,7 @@
foreach($cfgtypes as $type) {
if (strpos($switch, '--' . $type) ===
0) {
foreach($cfgfiles as $file) {
- if ($switch == '--' .
$type.'-' . $file) {
+ if ($switch == '--' .
$type . '-' . $file) {
$cfg[$type][$file] = true;
$is_switch =
false;
break;
@@ -454,10 +455,10 @@
case '--verbose':
$DETAILED = true;
break;
- //case 'w'
case 'x':
$environment['SKIP_SLOW_TESTS'] = 1;
break;
+ //case 'w'
case '-':
// repeat check with full switch
$switch = $argv[$i];
@@ -470,7 +471,7 @@
$html_output =
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiMon Jul 21 16:08:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Sync with PHP 6.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.34r2=1.226.2.37.2.35.2.35diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.34
php-src/run-tests.php:1.226.2.37.2.35.2.35
--- php-src/run-tests.php:1.226.2.37.2.35.2.34 Mon Jul 21 11:05:23 2008
+++ php-src/run-tests.php Mon Jul 21 16:08:15 2008
@@ -2,7 +2,7 @@
?php
/*
+--+
- | PHP Version 5|
+ | PHP Version 5, 6 |
+--+
| Copyright (c) 1997-2008 The PHP Group|
+--+
@@ -24,13 +24,13 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.34 2008/07/21 11:05:23 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.35 2008/07/21 16:08:15 jani 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
* not run without it.
*/
-if (!extension_loaded(pcre)) {
+if (!extension_loaded('pcre')) {
echo NO_PCRE_ERROR
+---+
@@ -45,7 +45,7 @@
exit;
}
-if (!function_exists(proc_open)) {
+if (!function_exists('proc_open')) {
echo NO_PROC_OPEN_ERROR
+---+
@@ -58,6 +58,11 @@
exit;
}
+// If timezone is not set, use UTC.
+if (ini_get('date.timezone') == '') {
+ date_default_timezone_set('UTC');
+}
+
// store current directory
$CUR_DIR = getcwd();
@@ -86,10 +91,10 @@
if (ob_get_level()) echo Not all buffers were deleted.\n;
error_reporting(E_ALL);
-ini_set('magic_quotes_runtime',0); // this would break tests by modifying
EXPECT sections
-
-if (ini_get('safe_mode')) {
- echo SAFE_MODE_WARNING
+if (PHP_MAJOR_VERSION 6) {
+ ini_set('magic_quotes_runtime',0); // this would break tests by
modifying EXPECT sections
+ if (ini_get('safe_mode')) {
+ echo SAFE_MODE_WARNING
+---+
| ! WARNING ! |
@@ -101,6 +106,7 @@
SAFE_MODE_WARNING;
+ }
}
$environment = isset($_ENV) ? $_ENV : array();
@@ -148,11 +154,11 @@
global $php;
if (empty($php) || !file_exists($php)) {
- error(environment variable TEST_PHP_EXECUTABLE must be set to
specify PHP executable!);
+ error('environment variable TEST_PHP_EXECUTABLE must be set to
specify PHP executable!');
}
- if (function_exists('is_executable') [EMAIL PROTECTED]($php)) {
- error(invalid PHP executable specified by TEST_PHP_EXECUTABLE
= . $php);
+ if (function_exists('is_executable') !is_executable($php)) {
+ error(invalid PHP executable specified by TEST_PHP_EXECUTABLE
= $php);
}
}
@@ -183,7 +189,7 @@
'safe_mode=0',
'disable_functions=',
'output_buffering=Off',
- 'error_reporting=32767',
+ 'error_reporting=' . ((PHP_MAJOR_VERSION == 5) ? '32767' :
'30719'),
'display_errors=1',
'display_startup_errors=1',
'log_errors=0',
@@ -199,6 +205,10 @@
'auto_append_file=',
'magic_quotes_runtime=0',
'ignore_repeated_errors=0',
+ 'unicode.runtime_encoding=ISO-8859-1',
+ 'unicode.script_encoding=UTF-8',
+ 'unicode.output_encoding=UTF-8',
+ 'unicode.from_error_mode=U_INVALID_SUBSTITUTE',
);
function write_information($show_html)
@@ -280,7 +290,7 @@
$pass_options = '';
$compression = 0;
-$output_file = $CUR_DIR . '/php_test_results_' . @date('Ymd_Hi') . '.txt';
+$output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt';
if ($compression) {
$output_file = 'compress.zlib://' . $output_file . '.gz';
@@ -357,7 +367,7 @@
switch($switch) {
case 'r':
case 'l':
- $test_list = @file($argv[++$i]);
+ $test_list = file($argv[++$i]);
if ($test_list) {
foreach($test_list as $test) {
$matches = array();
@@
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
Hello Jani,
Monday, July 21, 2008, 6:08:15 PM, you wrote:
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.34r2=1.226.2.37.2.35.2.35diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.34
php-src/run-tests.php:1.226.2.37.2.35.2.35
--- php-src/run-tests.php:1.226.2.37.2.35.2.34 Mon Jul 21 11:05:23 2008
+++ php-src/run-tests.php Mon Jul 21 16:08:15 2008
@@ -857,16 +863,16 @@
$failed_tests_data .= Bundled Libtool:\n$libtool\n;
$failed_tests_data .= System Libtool:\n$sys_libtool\n;
$failed_tests_data .= Compiler:\n$compiler\n;
- $failed_tests_data .= Bison:\n. @shell_exec('bison
--version 2/dev/null'). \n;
+ $failed_tests_data .= Bison:\n. shell_exec('bison --version
2/dev/null') . \n;
Seeing this again, is it really a good idea to list those? Shouldn't we
instead check whether we have the Makefile for the php we test and show the
versions from the respective programs specified in it instead?
Other than that, thanks for cleaning this up. I still thing we should
rewrite larger chunks of it though :-)
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
Marcus Boerger kirjoitti:
Hello Jani,
Monday, July 21, 2008, 6:08:15 PM, you wrote:
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.34r2=1.226.2.37.2.35.2.35diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.34
php-src/run-tests.php:1.226.2.37.2.35.2.35
--- php-src/run-tests.php:1.226.2.37.2.35.2.34 Mon Jul 21 11:05:23 2008
+++ php-src/run-tests.php Mon Jul 21 16:08:15 2008
@@ -857,16 +863,16 @@
$failed_tests_data .= Bundled Libtool:\n$libtool\n;
$failed_tests_data .= System Libtool:\n$sys_libtool\n;
$failed_tests_data .= Compiler:\n$compiler\n;
- $failed_tests_data .= Bison:\n. @shell_exec('bison --version
2/dev/null'). \n;
+ $failed_tests_data .= Bison:\n. shell_exec('bison --version
2/dev/null') . \n;
Seeing this again, is it really a good idea to list those? Shouldn't we
instead check whether we have the Makefile for the php we test and show the
versions from the respective programs specified in it instead?
I only tried to sync HEAD and PHP_5_3. Nothing else. Seeing that part..well..how
useful info is that anyway? You actually can only trust what is in the binary.
And we don't currently save compiler, bison, re2c etc. versions anywhere, but
maybe they should be? Steph already added some COMPILER / ARCHITECTURE stuff to
phpinfo() (only set with win32 builds now). Libtool version is irrelevant. That
has been bundled for a long time.
Other than that, thanks for cleaning this up. I still thing we should
rewrite larger chunks of it though :-)
Well, the whole thing is quite complex as is. Kinda grew up to be like that? :)
If I had time I might rewrite some if not all of it..but perhaps it's better
left as a project for next year's GSoC. ;)
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
pajoye Wed Jul 16 15:41:58 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- fix the fix
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.29r2=1.226.2.37.2.35.2.30diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.29
php-src/run-tests.php:1.226.2.37.2.35.2.30
--- php-src/run-tests.php:1.226.2.37.2.35.2.29 Tue Jul 8 18:18:08 2008
+++ php-src/run-tests.php Wed Jul 16 15:41:58 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.29 2008/07/08 18:18:08 nlopess Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.30 2008/07/16 15:41:58 pajoye 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
@@ -449,7 +449,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.29
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.30
$'.\n;
exit(1);
case 'u':
@@ -552,7 +552,7 @@
}
if (strlen($conf_passed))
{
- if (substr(PHP_OS, 0, 3) != WIN) {
+ if (substr(PHP_OS, 0, 3) == WIN) {
$pass_options .= -c . escapeshellarg($conf_passed);
} else {
$pass_options .= -c '$conf_passed';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
pajoye Wed Jul 2 12:47:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- MFH: fix make test TESTS=... and dynamic extension usage on windows
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.26r2=1.226.2.37.2.35.2.27diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.26
php-src/run-tests.php:1.226.2.37.2.35.2.27
--- php-src/run-tests.php:1.226.2.37.2.35.2.26 Tue Jun 24 06:05:29 2008
+++ php-src/run-tests.php Wed Jul 2 12:47:06 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.26 2008/06/24 06:05:29 dmitry Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.27 2008/07/02 12:47:06 pajoye 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
@@ -447,7 +447,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.26
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.27
$'.\n;
exit(1);
case 'u':
@@ -550,7 +550,11 @@
}
if (strlen($conf_passed))
{
- $pass_options .= -c '$conf_passed';
+ if (substr(PHP_OS, 0, 3) != WIN)) {
+ $pass_options .= -c . escapeshellarg($conf_passed);
+ } else {
+ $pass_options .= -c '$conf_passed';
+ }
}
$test_files = array_unique($test_files);
$test_files = array_merge($test_files, $redir_tests);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
ohill Wed Jul 2 15:00:21 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Fix parse error
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.27r2=1.226.2.37.2.35.2.28diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.27
php-src/run-tests.php:1.226.2.37.2.35.2.28
--- php-src/run-tests.php:1.226.2.37.2.35.2.27 Wed Jul 2 12:47:06 2008
+++ php-src/run-tests.php Wed Jul 2 15:00:21 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.27 2008/07/02 12:47:06 pajoye Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.28 2008/07/02 15:00:21 ohill 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
@@ -447,7 +447,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.27
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.28
$'.\n;
exit(1);
case 'u':
@@ -550,7 +550,7 @@
}
if (strlen($conf_passed))
{
- if (substr(PHP_OS, 0, 3) != WIN)) {
+ if (substr(PHP_OS, 0, 3) != WIN) {
$pass_options .= -c . escapeshellarg($conf_passed);
} else {
$pass_options .= -c '$conf_passed';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
dmitry Tue Jun 24 06:05:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Reverted part of Steph's patch (stdin stream must be closed to make script
finish)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.25r2=1.226.2.37.2.35.2.26diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.25
php-src/run-tests.php:1.226.2.37.2.35.2.26
--- php-src/run-tests.php:1.226.2.37.2.35.2.25 Thu Jun 19 21:09:43 2008
+++ php-src/run-tests.php Tue Jun 24 06:05:29 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.25 2008/06/19 21:09:43 pajoye Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.26 2008/06/24 06:05:29 dmitry 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
@@ -447,7 +447,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.25
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.26
$'.\n;
exit(1);
case 'u':
@@ -929,6 +929,7 @@
if (is_string($stdin)) {
fwrite($pipes[0], $stdin);
}
+ fclose($pipes[0]);
$timeout = $leak_check ? 300 : (isset($env['TEST_TIMEOUT']) ?
$env['TEST_TIMEOUT'] : 60);
@@ -942,7 +943,6 @@
if ($n === 0) {
/* timed out */
$data .= \n ** ERROR: process timed out **\n;
- fclose($pipes[0]);
proc_terminate($proc);
return $data;
} else if ($n 0) {
@@ -958,7 +958,6 @@
if ($stat['signaled']) {
$data .= \nTermsig=.$stat['stopsig'];
}
- fclose($pipes[0]);
$code = proc_close($proc);
return $data;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
sfoxThu Jun 19 21:03:37 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Two new options for Travis to come to terms with:
- --set-timeout n sets the timeout in seconds for the call to
stream_select() during system_with_timeout()
- -x sets an environmental variable, SKIP_SLOW_TESTS, which can be checked
for during a SKIPIF clause
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.21r2=1.226.2.37.2.35.2.22diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.21
php-src/run-tests.php:1.226.2.37.2.35.2.22
--- php-src/run-tests.php:1.226.2.37.2.35.2.21 Mon May 26 11:33:38 2008
+++ php-src/run-tests.php Thu Jun 19 21:03:36 2008
@@ -1,5 +1,6 @@
#!/usr/bin/php
?php
+putenv('TEST_PHP_EXECUTABLE=C:/sandbox/php5/Debug_TS/php.exe');
/*
+--+
| PHP Version 5|
@@ -24,7 +25,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.21 2008/05/26 11:33:38 tony2001 Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.22 2008/06/19 21:03:36 sfox 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
@@ -441,7 +442,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.21
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.22
$'.\n;
exit(1);
case 'u':
@@ -869,7 +870,7 @@
function save_text($filename, $text, $filename_copy = null)
{
global $DETAILED;
-
+file_put_contents('steph.test.again.php', $text);
if ($filename_copy $filename_copy != $filename) {
if (@file_put_contents($filename_copy, $text) === false) {
error(Cannot open file ' . $filename_copy . '
(save_text));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
sfoxThu Jun 19 21:08:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Two new options for Travis to come to terms with:
- --set-timeout n sets the timeout in seconds for the call to
stream_select() during system_with_timeout()
- -x sets an environmental variable, SKIP_SLOW_TESTS, which can be checked
for during a SKIPIF clause
and just for a special treat, you can have it from my working branch this
time.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.22r2=1.226.2.37.2.35.2.23diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.22
php-src/run-tests.php:1.226.2.37.2.35.2.23
--- php-src/run-tests.php:1.226.2.37.2.35.2.22 Thu Jun 19 21:03:36 2008
+++ php-src/run-tests.php Thu Jun 19 21:08:13 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.22 2008/06/19 21:03:36 sfox Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.23 2008/06/19 21:08:13 sfox 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
@@ -408,6 +408,9 @@
$output_file = $argv[++$i];
$just_save_results = true;
break;
+ case '--set-timeout':
+ $environment['TEST_TIMEOUT'] =
$argv[++$i];
+ break;
case '--show-all':
foreach($cfgfiles as $file) {
$cfg['show'][$file] = true;
@@ -430,6 +433,9 @@
$DETAILED = true;
break;
//case 'w'
+ case 'x':
+ $environment['SKIP_SLOW_TESTS'] = 1;
+ break;
case '-':
// repeat check with full switch
$switch = $argv[$i];
@@ -442,7 +448,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.22
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.23
$'.\n;
exit(1);
case 'u':
@@ -924,18 +930,20 @@
if (is_string($stdin)) {
fwrite($pipes[0], $stdin);
}
- fclose($pipes[0]);
+
+ $timeout = $leak_check ? 300 : (isset($env['TEST_TIMEOUT']) ?
$env['TEST_TIMEOUT'] : 60);
while (true) {
/* hide errors from interrupted syscalls */
$r = $pipes;
$w = null;
$e = null;
- $n = @stream_select($r, $w, $e, $leak_check ? 300 : 60);
+ $n = @stream_select($r, $w, $e, $timeout);
if ($n === 0) {
/* timed out */
$data .= \n ** ERROR: process timed out **\n;
+ fclose($pipes[0]);
proc_terminate($proc);
return $data;
} else if ($n 0) {
@@ -951,6 +959,7 @@
if ($stat['signaled']) {
$data .= \nTermsig=.$stat['stopsig'];
}
+ fclose($pipes[0]);
$code = proc_close($proc);
return $data;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
sfoxThu Jun 19 21:08:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Oops.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.23r2=1.226.2.37.2.35.2.24diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.23
php-src/run-tests.php:1.226.2.37.2.35.2.24
--- php-src/run-tests.php:1.226.2.37.2.35.2.23 Thu Jun 19 21:08:13 2008
+++ php-src/run-tests.php Thu Jun 19 21:08:56 2008
@@ -1,6 +1,5 @@
#!/usr/bin/php
?php
-putenv('TEST_PHP_EXECUTABLE=C:/sandbox/php5/Debug_TS/php.exe');
/*
+--+
| PHP Version 5|
@@ -25,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.23 2008/06/19 21:08:13 sfox Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.24 2008/06/19 21:08:56 sfox 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
@@ -448,7 +447,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.23
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.24
$'.\n;
exit(1);
case 'u':
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
pajoye Thu Jun 19 21:09:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- remove debug code
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.24r2=1.226.2.37.2.35.2.25diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.24
php-src/run-tests.php:1.226.2.37.2.35.2.25
--- php-src/run-tests.php:1.226.2.37.2.35.2.24 Thu Jun 19 21:08:56 2008
+++ php-src/run-tests.php Thu Jun 19 21:09:43 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.24 2008/06/19 21:08:56 sfox Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.25 2008/06/19 21:09:43 pajoye 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
@@ -447,7 +447,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.24
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.25
$'.\n;
exit(1);
case 'u':
@@ -875,7 +875,7 @@
function save_text($filename, $text, $filename_copy = null)
{
global $DETAILED;
-file_put_contents('steph.test.again.php', $text);
+
if ($filename_copy $filename_copy != $filename) {
if (@file_put_contents($filename_copy, $text) === false) {
error(Cannot open file ' . $filename_copy . '
(save_text));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
+ + $timeout = $leak_check ? 300 : (isset($env['TEST_TIMEOUT']) ? $env['TEST_TIMEOUT'] : 60); I don't particularly like this semantic, as that way I can't set the timeout when using valgrind. A better way would be (IMHO): $timeout = isset($env['TEST_TIMEOUT']) ? $env['TEST_TIMEOUT'] : ($leak_check ? 300 : 60); Also, maybe it's time to put the timeout value computation outside of the function, otherwise that's two ifs for each test execution + skipif execution. Anyway this seems a great addition, as now I can fine tune the timeout without editing the script by hand. Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
zoe Sun May 25 16:05:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Added --XFAIL-- section
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.19r2=1.226.2.37.2.35.2.20diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.19
php-src/run-tests.php:1.226.2.37.2.35.2.20
--- php-src/run-tests.php:1.226.2.37.2.35.2.19 Mon Mar 17 17:18:19 2008
+++ php-src/run-tests.php Sun May 25 16:05:04 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.19 2008/03/17 17:18:19 nlopess Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.20 2008/05/25 16:05:04 zoe 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
@@ -260,7 +260,7 @@
$test_files = array();
$redir_tests = array();
$test_results = array();
-$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array(), 'WARNED'
= array(), 'LEAKED' = array());
+$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array(), 'WARNED'
= array(), 'LEAKED' = array(), 'XFAILED' = array());
// If parameters given assume they represent selected tests to run.
$failed_tests_file= false;
@@ -441,7 +441,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.19
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.20
$'.\n;
exit(1);
case 'u':
@@ -712,7 +712,7 @@
/* We got failed Tests, offer the user to send an e-mail to QA team, unless
NO_INTERACTION is set */
if (!getenv('NO_INTERACTION')) {
$fp = fopen(php://stdin, r+);
- if ($sum_results['FAILED'] || $sum_results['BORKED'] ||
$sum_results['WARNED'] || $sum_results['LEAKED']) {
+ if ($sum_results['FAILED'] || $sum_results['BORKED'] ||
$sum_results['WARNED'] || $sum_results['LEAKED'] || $sum_results['XFAILED']) {
echo \nYou may have found a problem in PHP.;
}
echo \nWe would like to send this report automatically to the\n;
@@ -748,8 +748,8 @@
$failed_tests_data .= $failed_test_summary . \n;
$failed_tests_data .= get_summary(true, false) . \n;
-
- if ($sum_results['FAILED']) {
+ //Not sending XFAIL results since failure is intentional.
+ if ($sum_results['FAILED'] ) {
foreach ($PHP_FAILED_TESTS['FAILED'] as $test_info) {
$failed_tests_data .= $sep . $test_info['name']
. $test_info['info'];
$failed_tests_data .= $sep .
file_get_contents(realpath($test_info['output']));
@@ -981,7 +981,7 @@
if (!is_array($name) $result != 'REDIR')
{
$test_results[$index] = $result;
- if ($failed_tests_file ($result == 'FAILED' ||
$result == 'WARNED' || $result == 'LEAKED'))
+ if ($failed_tests_file ($result = 'XFAILED' ||
$result == 'FAILED' || $result == 'WARNED' || $result == 'LEAKED'))
{
fwrite($failed_tests_file, $index\n);
}
@@ -1627,7 +1627,11 @@
$restype[] = 'WARN';
}
if (!$passed) {
- $restype[] = 'FAIL';
+ if(isset($section_text['XFAIL'])) {
+ $restype[] = 'XFAIL';
+ }else{
+ $restype[] = 'FAIL';
+ }
}
if (!$passed) {
@@ -1840,7 +1844,7 @@
$n_total = count($test_results);
$n_total += $ignored_by_ext;
- $sum_results = array('PASSED'=0, 'WARNED'=0, 'SKIPPED'=0,
'FAILED'=0, 'BORKED'=0, 'LEAKED'=0);
+ $sum_results = array('PASSED'=0, 'WARNED'=0, 'SKIPPED'=0,
'FAILED'=0, 'BORKED'=0, 'LEAKED'=0, 'XFAILED'=0);
foreach ($test_results as $v) {
$sum_results[$v]++;
}
@@ -1859,10 +1863,11 @@
if ($x_total) {
$x_warned = (100.0 * $sum_results['WARNED']) / $x_total;
$x_failed = (100.0 * $sum_results['FAILED']) / $x_total;
+ $x_xfailed = (100.0 * $sum_results['XFAILED']) / $x_total;
$x_leaked = (100.0 * $sum_results['LEAKED']) / $x_total;
$x_passed = (100.0 * $sum_results['PASSED']) / $x_total;
} else {
- $x_warned = $x_failed = $x_passed = $x_leaked = 0;
+ $x_warned = $x_failed = $x_passed = $x_leaked = $x_xfailed = 0;
}
$summary
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
nlopess Mon Mar 17 17:18:19 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
detect test cases with duplicated sections
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.18r2=1.226.2.37.2.35.2.19diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.18
php-src/run-tests.php:1.226.2.37.2.35.2.19
--- php-src/run-tests.php:1.226.2.37.2.35.2.18 Wed Mar 5 20:10:12 2008
+++ php-src/run-tests.php Mon Mar 17 17:18:19 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.18 2008/03/05 20:10:12 lstrojny Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.19 2008/03/17 17:18:19 nlopess 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
@@ -441,7 +441,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.18
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.19
$'.\n;
exit(1);
case 'u':
@@ -1032,16 +1032,7 @@
;
// Load the sections of the test file.
- $section_text = array(
- 'TEST' = '',
- 'SKIPIF' = '',
- 'GET'= '',
- 'COOKIE' = '',
- 'POST_RAW' = '',
- 'POST' = '',
- 'UPLOAD' = '',
- 'ARGS' = '',
- );
+ $section_text = array('TEST' = '');
$fp = fopen($file, rt) or error(Cannot open test file: $file);
@@ -1066,6 +1057,12 @@
// Match the beginning of a section.
if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
$section = $r[1];
+
+ if (isset($section_text[$section])) {
+ $bork_info = duplicated $section section;
+ $borked= true;
+ }
+
$section_text[$section] = '';
$secfile = $section == 'FILE' || $section == 'FILEEOF'
|| $section == 'FILE_EXTERNAL';
$secdone = false;
@@ -1392,7 +1389,7 @@
$env['HTTP_COOKIE'] = '';
}
- $args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
+ $args = isset($section_text['ARGS']) ? ' -- '.$section_text['ARGS'] :
'';
if (array_key_exists('POST_RAW', $section_text)
!empty($section_text['POST_RAW'])) {
$post = trim($section_text['POST_RAW']);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
lstrojnyWed Mar 5 20:10:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Using new magic constant __DIR__ in run-tests.php
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.17r2=1.226.2.37.2.35.2.18diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.17
php-src/run-tests.php:1.226.2.37.2.35.2.18
--- php-src/run-tests.php:1.226.2.37.2.35.2.17 Sun Feb 24 12:17:25 2008
+++ php-src/run-tests.php Wed Mar 5 20:10:12 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.17 2008/02/24 12:17:25 felipe Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.18 2008/03/05 20:10:12 lstrojny 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
@@ -198,7 +198,7 @@
global $cwd, $php, $php_cgi, $php_info, $user_tests, $ini_overwrites,
$pass_options, $exts_to_test, $leak_check, $valgrind_header;
// Get info from php
- $info_file = realpath(dirname(__FILE__)) . '/run-test-info.php';
+ $info_file = __DIR__ . '/run-test-info.php';
@unlink($info_file);
$php_info = '?php echo
PHP_SAPI: . PHP_SAPI .
@@ -441,7 +441,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.17
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.18
$'.\n;
exit(1);
case 'u':
@@ -777,7 +777,7 @@
$libtool = shell_exec($CUR_DIR . '/libtool --version');
/* Use shtool to find out if there is glibtool present
(MacOSX) */
- $sys_libtool_path = shell_exec(dirname(__FILE__) .
'/build/shtool path glibtool libtool');
+ $sys_libtool_path = shell_exec(__DIR__ . '/build/shtool
path glibtool libtool');
if ($sys_libtool_path) {
$sys_libtool = shell_exec(str_replace(\n, ,
$sys_libtool_path) . ' --version');
}
@@ -1183,7 +1183,7 @@
$temp_clean= $temp_dir . DIRECTORY_SEPARATOR .
$main_file_name.'clean.php';
$test_clean= $test_dir . DIRECTORY_SEPARATOR .
$main_file_name.'clean.php';
$tmp_post = $temp_dir . DIRECTORY_SEPARATOR . uniqid('/phpt.');
- $tmp_relative_file = str_replace(dirname(__FILE__).DIRECTORY_SEPARATOR,
'', $test_file) . 't';
+ $tmp_relative_file = str_replace(__DIR__ . DIRECTORY_SEPARATOR, '',
$test_file) . 't';
if ($temp_source $temp_target) {
$temp_skipif .= 's';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
felipe Sun Feb 24 12:17:26 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: New E_ALL value http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.16r2=1.226.2.37.2.35.2.17diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.16 php-src/run-tests.php:1.226.2.37.2.35.2.17 --- php-src/run-tests.php:1.226.2.37.2.35.2.16 Tue Feb 12 18:23:14 2008 +++ php-src/run-tests.php Sun Feb 24 12:17:25 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.16 2008/02/12 18:23:14 iliaa Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.17 2008/02/24 12:17:25 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 @@ -175,7 +175,7 @@ 'safe_mode=0', 'disable_functions=', 'output_buffering=Off', - 'error_reporting=8191', + 'error_reporting=16383', 'display_errors=1', 'display_startup_errors=1', 'log_errors=0', @@ -441,7 +441,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.16 $'.\n; + echo '$Revision: 1.226.2.37.2.35.2.17 $'.\n; exit(1); case 'u': -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
iliaa Tue Feb 12 18:23:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Disable mbstring overload
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.15r2=1.226.2.37.2.35.2.16diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.15
php-src/run-tests.php:1.226.2.37.2.35.2.16
--- php-src/run-tests.php:1.226.2.37.2.35.2.15 Fri Feb 8 16:46:23 2008
+++ php-src/run-tests.php Tue Feb 12 18:23:14 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.15 2008/02/08 16:46:23 nlopess Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.16 2008/02/12 18:23:14 iliaa 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
@@ -231,6 +231,7 @@
'tidy' = array('tidy.clean_output=0'),
'zlib' = array('zlib.output_compression=Off'),
'xdebug' = array('xdebug.default_enable=0'),
+ 'mbstring' = array('mbstring.func_overload=0'),
);
foreach($info_params_ex as $ext = $ini_overwrites_ex) {
if (in_array($ext, $exts_to_test)) {
@@ -440,7 +441,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.15
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.16
$'.\n;
exit(1);
case 'u':
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
nlopess Fri Feb 8 16:46:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
fix ===DONE=== with windows EOLs
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.14r2=1.226.2.37.2.35.2.15diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.14
php-src/run-tests.php:1.226.2.37.2.35.2.15
--- php-src/run-tests.php:1.226.2.37.2.35.2.14 Tue Jan 15 13:03:54 2008
+++ php-src/run-tests.php Fri Feb 8 16:46:23 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.14 2008/01/15 13:03:54 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.15 2008/02/08 16:46:23 nlopess 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
@@ -440,7 +440,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.14
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.15
$'.\n;
exit(1);
case 'u':
@@ -1077,7 +1077,7 @@
}
// End of actual test?
- if ($secfile preg_match('/^===DONE===$/', $line)) {
+ if ($secfile preg_match('/^===DONE===\s*$/', $line)) {
$secdone = true;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
Hello Nuno,
Friday, February 8, 2008, 5:46:23 PM, you wrote:
nlopess Fri Feb 8 16:46:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
fix ===DONE=== with windows EOLs
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.14r2=1.226.2.37.2.35.2.15diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.14
php-src/run-tests.php:1.226.2.37.2.35.2.15
--- php-src/run-tests.php:1.226.2.37.2.35.2.14 Tue Jan 15 13:03:54 2008
+++ php-src/run-tests.php Fri Feb 8 16:46:23 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.14 2008/01/15 13:03:54 helly Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.15 2008/02/08 16:46:23 nlopess 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
@@ -440,7 +440,7 @@
$html_output =
is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.14
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.15
$'.\n;
exit(1);
case 'u':
@@ -1077,7 +1077,7 @@
}
// End of actual test?
- if ($secfile preg_match('/^===DONE===$/', $line)) {
+ if ($secfile preg_match('/^===DONE===\s*$/', $line)) {
$secdone = true;
}
}
should that not read /^===DONE===\r?$/ ?
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
nlopess Fri Feb 8 16:46:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
fix ===DONE=== with windows EOLs
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.14r2=1.226.2.37.2.35.2.15diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.14
php-src/run-tests.php:1.226.2.37.2.35.2.15
--- php-src/run-tests.php:1.226.2.37.2.35.2.14 Tue Jan 15 13:03:54 2008
+++ php-src/run-tests.php Fri Feb 8 16:46:23 2008
@@ -1077,7 +1077,7 @@
}
// End of actual test?
- if ($secfile preg_match('/^===DONE===$/', $line)) {
+ if ($secfile preg_match('/^===DONE===\s*$/', $line)) {
$secdone = true;
}
}
should that not read /^===DONE===\r?$/ ?
to be strict, yes, but I don't think we need to be soo strict. Imagine you
left a tab after ===DONE===, I think we can allow that as well.
Nuno
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
helly Tue Jan 15 13:03:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- MFH valgrind detection, note in header
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.13r2=1.226.2.37.2.35.2.14diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.13
php-src/run-tests.php:1.226.2.37.2.35.2.14
--- php-src/run-tests.php:1.226.2.37.2.35.2.13 Sun Jan 6 16:48:11 2008
+++ php-src/run-tests.php Tue Jan 15 13:03:54 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.13 2008/01/06 16:48:11 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.14 2008/01/15 13:03:54 helly 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
@@ -77,6 +77,7 @@
set_time_limit(0);
$valgrind_version = 0;
+$valgrind_header = '';
// delete as much output buffers as possible
while(@ob_end_clean());
@@ -194,7 +195,7 @@
function write_information($show_html)
{
- global $cwd, $php, $php_cgi, $php_info, $user_tests, $ini_overwrites,
$pass_options, $exts_to_test;
+ global $cwd, $php, $php_cgi, $php_info, $user_tests, $ini_overwrites,
$pass_options, $exts_to_test, $leak_check, $valgrind_header;
// Get info from php
$info_file = realpath(dirname(__FILE__)) . '/run-test-info.php';
@@ -248,6 +249,7 @@
echo {$test_dir}\n ;
}
echo
+VALGRIND: . ($leak_check ? $valgrind_header : 'Not used') .
=
;
}
@@ -367,6 +369,18 @@
//case 'l'
case 'm':
$leak_check = true;
+ $valgrind_cmd = valgrind --version;
+ $valgrind_header =
system_with_timeout($valgrind_cmd);
+ $replace_count = 0;
+ if (!$valgrind_header) {
+ error(Valgrind returned no
version info, cannot proceed.\nPlease check if Valgrind is installed.);
+ } else {
+ $valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/, '$1$2$3',
$valgrind_header, 1, $replace_count);
+ if ($replace_count != 1 ||
!is_numeric($valgrind_version)) {
+ error(Valgrind
returned invalid version info (\$valgrind_header\), cannot proceed.);
+ }
+ $valgrind_header =
trim($valgrind_header);
+ }
break;
case 'n':
if (!$pass_option_n) {
@@ -426,7 +440,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.13
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.14
$'.\n;
exit(1);
case 'u':
@@ -1435,20 +1449,6 @@
if ($leak_check) {
$env['USE_ZEND_ALLOC'] = '0';
- if (!$valgrind_version) {
- $valgrind_cmd = valgrind --version;
- $out = system_with_timeout($valgrind_cmd);
- $replace_count = 0;
-
- if (!$out) {
- error(Valgrind returned no version info,
cannot proceed.\nPlease check if Valgrind is installed.);
- } else {
- $valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)(\s+)/, '$1$2$3', $out, 1,
$replace_count);
- if ($replace_count != 1 ||
!is_numeric($valgrind_version)) {
- error(Valgrind returned invalid
version info (\$out\), cannot proceed.);
- }
- }
- }
if ($valgrind_version = 330) {
/* valgrind 3.3.0+ doesn't have --log-file-exactly
option */
$cmd = valgrind -q --tool=memcheck
--trace-children=yes --log-file=$memcheck_filename $cmd;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
helly Sun Jan 6 16:48:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- MFH Show info for CL and CGI if both are going to be used
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.12r2=1.226.2.37.2.35.2.13diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.12
php-src/run-tests.php:1.226.2.37.2.35.2.13
--- php-src/run-tests.php:1.226.2.37.2.35.2.12 Sat Jan 5 21:39:53 2008
+++ php-src/run-tests.php Sun Jan 6 16:48:11 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.12 2008/01/05 21:39:53 cellog Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.13 2008/01/06 16:48:11 helly 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
@@ -106,11 +106,22 @@
// Require the explicit specification.
// Otherwise we could end up testing the wrong file!
+$php = NULL;
+$php_cgi = NULL;
+
if (getenv('TEST_PHP_EXECUTABLE')) {
$php = getenv('TEST_PHP_EXECUTABLE');
if ($php=='auto') {
$php = $cwd.'/sapi/cli/php';
putenv(TEST_PHP_EXECUTABLE=$php);
+ if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
+ $php_cgi = $cwd.'/sapi/cgi/php-cgi';
+ if (file_exists($php_cgi)) {
+ putenv(TEST_PHP_CGI_EXECUTABLE=$php_cgi);
+ } else {
+ $php_cgi = NULL;
+ }
+ }
}
$environment['TEST_PHP_EXECUTABLE'] = $php;
}
@@ -183,7 +194,7 @@
function write_information($show_html)
{
- global $cwd, $php, $php_info, $user_tests, $ini_overwrites,
$pass_options, $exts_to_test;
+ global $cwd, $php, $php_cgi, $php_info, $user_tests, $ini_overwrites,
$pass_options, $exts_to_test;
// Get info from php
$info_file = realpath(dirname(__FILE__)) . '/run-test-info.php';
@@ -200,8 +211,15 @@
settings2array($ini_overwrites,$info_params);
settings2params($info_params);
$php_info = `$php $pass_options $info_params $info_file`;
- @unlink($info_file);
define('TESTED_PHP_VERSION', `$php -r echo PHP_VERSION;`);
+ if ($php_cgi $php != $php_cgi) {
+ $php_info_cgi = `$php_cgi $pass_options $info_params -q
$info_file`;
+ $php_info_sep =
\n-;
+ $php_cgi_info = $php_info_sep\nPHP : $php_cgi
$php_info_cgi$php_info_sep;
+ } else {
+ $php_cgi_info = '';
+ }
+ @unlink($info_file);
// load list of enabled extensions
save_text($info_file, '?php echo join(,,get_loaded_extensions());
?');
@@ -223,8 +241,8 @@
// Write test context information.
echo
=
+PHP : $php $php_info $php_cgi_info
CWD : $cwd
-PHP : $php $php_info
Extra dirs : ;
foreach ($user_tests as $test_dir) {
echo {$test_dir}\n ;
@@ -408,7 +426,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.12
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.13
$'.\n;
exit(1);
case 'u':
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
cellog Sat Jan 5 21:05:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
implement --FILE_EXTERNAL-- section for using an external file as --FILE--,
use CGI for --EXPECTHEADERS--, fix --POST_RAW--
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.10r2=1.226.2.37.2.35.2.11diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.10
php-src/run-tests.php:1.226.2.37.2.35.2.11
--- php-src/run-tests.php:1.226.2.37.2.35.2.10 Tue Jan 1 06:15:40 2008
+++ php-src/run-tests.php Sat Jan 5 21:05:06 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.10 2008/01/01 06:15:40 sebastian Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.11 2008/01/05 21:05:06 cellog 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
@@ -408,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.10
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.11
$'.\n;
exit(1);
case 'u':
@@ -1034,7 +1034,7 @@
if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
$section = $r[1];
$section_text[$section] = '';
- $secfile = $section == 'FILE' || $section == 'FILEEOF';
+ $secfile = $section == 'FILE' || $section == 'FILEEOF'
|| $section == 'FILE_EXTERNAL';
$secdone = false;
continue;
}
@@ -1060,7 +1060,7 @@
$borked = false;
}
} else {
- if (@count($section_text['FILE']) +
@count($section_text['FILEEOF']) != 1) {
+ if (@count($section_text['FILE']) +
@count($section_text['FILEEOF']) + @count($section_text['FILE_EXTERNAL']) != 1)
{
$bork_info = missing section --FILE--;
$borked = true;
}
@@ -1068,6 +1068,17 @@
$section_text['FILE'] = preg_replace(/[\r\n]+$/, '',
$section_text['FILEEOF']);
unset($section_text['FILEEOF']);
}
+ if (@count($section_text['FILE_EXTERNAL']) == 1) {
+ // don't allow tests to retrieve files from anywhere
but this subdirectory
+ $section_text['FILE_EXTERNAL'] = dirname($file) . '/' .
trim(str_replace('..', '', $section_text['FILE_EXTERNAL']));
+ if (@file_exists($section_text['FILE_EXTERNAL'])) {
+ $section_text['FILE'] =
file_get_contents($section_text['FILE_EXTERNAL']);
+ unset($section_text['FILE_EXTERNAL']);
+ } else {
+ $bork_info = could not load --FILE_EXTERNAL--
. dirname($file) . '/' . trim($section_text['FILE_EXTERNAL']);
+ $borked = true;
+ }
+ }
if ((@count($section_text['EXPECT']) +
@count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) {
$bork_info = missing section --EXPECT--, --EXPECTF--
or --EXPECTREGEX--;
$borked = true;
@@ -1093,7 +1104,7 @@
$tested = trim($section_text['TEST']);
/* For GET/POST tests, check if cgi sapi is available and if it is, use
it. */
- if (!empty($section_text['GET']) || !empty($section_text['POST']) ||
!empty($section_text['POST_RAW']) || !empty($section_text['COOKIE'])) {
+ if (!empty($section_text['GET']) || !empty($section_text['POST']) ||
!empty($section_text['POST_RAW']) || !empty($section_text['COOKIE']) ||
!empty($section_text['EXPECTHEADERS'])) {
if (isset($php_cgi)) {
$old_php = $php;
$php = $php_cgi .' -C ';
@@ -1355,12 +1366,15 @@
$raw_lines = explode(\n, $post);
$request = '';
+ $started = false;
foreach ($raw_lines as $line) {
if (empty($env['CONTENT_TYPE'])
preg_match('/^Content-Type:(.*)/i', $line, $res)) {
$env['CONTENT_TYPE'] = trim(str_replace(\r,
'', $res[1]));
continue;
}
- $request .= $line . \n;
+ if ($started) $request .= \n;
+ $started = true;
+
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
cellog Sat Jan 5 21:39:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
remove potential preg warnings if --EXPECTHEADERS-- is combined with
--EXPECTF-- or --EXPECTRE--
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.11r2=1.226.2.37.2.35.2.12diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.11
php-src/run-tests.php:1.226.2.37.2.35.2.12
--- php-src/run-tests.php:1.226.2.37.2.35.2.11 Sat Jan 5 21:05:06 2008
+++ php-src/run-tests.php Sat Jan 5 21:39:53 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.11 2008/01/05 21:05:06 cellog Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.12 2008/01/05 21:39:53 cellog 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
@@ -408,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.11
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.12
$'.\n;
exit(1);
case 'u':
@@ -1600,7 +1600,7 @@
$wanted = $wanted_headers . \n--HEADERS--\n . $wanted;
$output = $output_headers . \n--HEADERS--\n . $output;
if (isset($wanted_re)) {
- $wanted_re = $wanted_headers . \n--HEADERS--\n .
$wanted_re;
+ $wanted_re = preg_quote($wanted_headers .
\n--HEADERS--\n, '/') . $wanted_re;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
sebastian Tue Jan 1 06:15:40 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: Leftover: Bump copyright year. http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.9r2=1.226.2.37.2.35.2.10diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.9 php-src/run-tests.php:1.226.2.37.2.35.2.10 --- php-src/run-tests.php:1.226.2.37.2.35.2.9 Tue Dec 25 12:06:34 2007 +++ php-src/run-tests.php Tue Jan 1 06:15:40 2008 @@ -4,7 +4,7 @@ +--+ | PHP Version 5| +--+ - | Copyright (c) 1997-2007 The PHP Group| + | Copyright (c) 1997-2008 The PHP Group| +--+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is| @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.9 2007/12/25 12:06:34 dmitry Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.10 2008/01/01 06:15:40 sebastian 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 @@ -408,7 +408,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.9 $'.\n; + echo '$Revision: 1.226.2.37.2.35.2.10 $'.\n; exit(1); case 'u': -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
dmitry Tue Dec 25 12:06:34 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Fixed %f regex
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.8r2=1.226.2.37.2.35.2.9diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.8
php-src/run-tests.php:1.226.2.37.2.35.2.9
--- php-src/run-tests.php:1.226.2.37.2.35.2.8 Mon Dec 24 04:23:04 2007
+++ php-src/run-tests.php Tue Dec 25 12:06:34 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.8 2007/12/24 04:23:04 kraghuba Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.9 2007/12/25 12:06:34 dmitry 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
@@ -408,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.8
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.9
$'.\n;
exit(1);
case 'u':
@@ -1537,7 +1537,7 @@
$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|e[+-]?\d+)?', $wanted_re);
+ $wanted_re = str_replace('%f',
'[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', $wanted_re);
$wanted_re = str_replace('%c', '.', $wanted_re);
// %f allows two points -.0.0 but that is the best
*simple* expression
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
kraghubaMon Dec 24 04:23:05 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Changing the regex for %f so the it will match e-, e+ and e.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.7r2=1.226.2.37.2.35.2.8diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.7
php-src/run-tests.php:1.226.2.37.2.35.2.8
--- php-src/run-tests.php:1.226.2.37.2.35.2.7 Mon Dec 17 11:00:16 2007
+++ php-src/run-tests.php Mon Dec 24 04:23:04 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.7 2007/12/17 11:00:16 bjori Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.8 2007/12/24 04:23:04 kraghuba 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
@@ -408,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.7
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.8
$'.\n;
exit(1);
case 'u':
@@ -1537,7 +1537,7 @@
$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('%f',
'[+-]?\.?\d+\.?\d*(?:E|e[+-]?\d+)?', $wanted_re);
$wanted_re = str_replace('%c', '.', $wanted_re);
// %f allows two points -.0.0 but that is the best
*simple* expression
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
bjori Mon Dec 17 11:00:16 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Check if we know which php executable we should use
# Fixes weird test failures when TEST_PHP_EXECUTABLE isn't set
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.6r2=1.226.2.37.2.35.2.7diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.6
php-src/run-tests.php:1.226.2.37.2.35.2.7
--- php-src/run-tests.php:1.226.2.37.2.35.2.6 Wed Dec 12 09:20:54 2007
+++ php-src/run-tests.php Mon Dec 17 11:00:16 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.6 2007/12/12 09:20:54 tony2001 Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.7 2007/12/17 11:00:16 bjori 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
@@ -408,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.6
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.7
$'.\n;
exit(1);
case 'u':
@@ -519,6 +519,7 @@
// Run selected tests.
$test_cnt = count($test_files);
if ($test_cnt) {
+ verify_config();
write_information($html_output);
usort($test_files, test_sort);
$start_time = time();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
tony2001Wed Dec 12 09:20:54 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: add support for Valgrind 3.3.0 (which doesn't have --log-file-exactly
option)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.5r2=1.226.2.37.2.35.2.6diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.5
php-src/run-tests.php:1.226.2.37.2.35.2.6
--- php-src/run-tests.php:1.226.2.37.2.35.2.5 Wed Dec 5 14:54:08 2007
+++ php-src/run-tests.php Wed Dec 12 09:20:54 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.5 2007/12/05 14:54:08 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.6 2007/12/12 09:20:54 tony2001 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
@@ -76,6 +76,8 @@
$cwd = getcwd();
set_time_limit(0);
+$valgrind_version = 0;
+
// delete as much output buffers as possible
while(@ob_end_clean());
if (ob_get_level()) echo Not all buffers were deleted.\n;
@@ -406,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.5
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.6
$'.\n;
exit(1);
case 'u':
@@ -979,6 +981,7 @@
global $pass_options, $DETAILED, $IN_REDIRECT, $test_cnt, $test_idx;
global $leak_check, $temp_source, $temp_target, $cfg, $environment;
global $no_clean;
+ global $valgrind_version;
$temp_filenames = null;
$org_file = $file;
@@ -1399,7 +1402,26 @@
if ($leak_check) {
$env['USE_ZEND_ALLOC'] = '0';
- $cmd = valgrind -q --tool=memcheck --trace-children=yes
--log-file-exactly=$memcheck_filename $cmd;
+ if (!$valgrind_version) {
+ $valgrind_cmd = valgrind --version;
+ $out = system_with_timeout($valgrind_cmd);
+ $replace_count = 0;
+
+ if (!$out) {
+ error(Valgrind returned no version info,
cannot proceed.\nPlease check if Valgrind is installed.);
+ } else {
+ $valgrind_version =
preg_replace(/valgrind-([0-9])\.([0-9])\.([0-9]+)(\s+)/, '$1$2$3', $out, 1,
$replace_count);
+ if ($replace_count != 1 ||
!is_numeric($valgrind_version)) {
+ error(Valgrind returned invalid
version info (\$out\), cannot proceed.);
+ }
+ }
+ }
+ if ($valgrind_version = 330) {
+ /* valgrind 3.3.0+ doesn't have --log-file-exactly
option */
+ $cmd = valgrind -q --tool=memcheck
--trace-children=yes --log-file=$memcheck_filename $cmd;
+ } else {
+ $cmd = valgrind -q --tool=memcheck
--trace-children=yes --log-file-exactly=$memcheck_filename $cmd;
+ }
} else {
$env['USE_ZEND_ALLOC'] = '1';
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
helly Wed Dec 5 13:55:46 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- Allow to specify php executable on commandline
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.3r2=1.226.2.37.2.35.2.4diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.3
php-src/run-tests.php:1.226.2.37.2.35.2.4
--- php-src/run-tests.php:1.226.2.37.2.35.2.3 Wed Nov 21 08:20:22 2007
+++ php-src/run-tests.php Wed Dec 5 13:55:46 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.3 2007/11/21 08:20:22 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.4 2007/12/05 13:55:46 helly 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
@@ -122,8 +122,10 @@
$environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
}
-if ($argc !=2 || ($argv[1] != '-h' $argv[1] != '-help' $argv !=
'--help'))
+function verify_config()
{
+ global $php;
+
if (empty($php) || !file_exists($php)) {
error(environment variable TEST_PHP_EXECUTABLE must be set to
specify PHP executable!);
}
@@ -350,6 +352,10 @@
case '--no-clean':
$no_clean = true;
break;
+ case 'p':
+ $php = $argv[++$i];
+ putenv(TEST_PHP_EXECUTABLE=$php);
+ break;
case 'q':
putenv('NO_INTERACTION=1');
break;
@@ -401,7 +407,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.3
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.4
$'.\n;
exit(1);
case 'u':
@@ -541,6 +547,7 @@
}
}
+verify_config();
write_information($html_output);
// Compile a list of all test files (*.phpt).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
helly Wed Dec 5 14:54:08 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- - Allow to check the out,exp and diff results on console while executing
the tests
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.4r2=1.226.2.37.2.35.2.5diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.4
php-src/run-tests.php:1.226.2.37.2.35.2.5
--- php-src/run-tests.php:1.226.2.37.2.35.2.4 Wed Dec 5 13:55:46 2007
+++ php-src/run-tests.php Wed Dec 5 14:54:08 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.4 2007/12/05 13:55:46 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.5 2007/12/05 14:54:08 helly 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
@@ -260,7 +260,7 @@
$no_clean = false;
$cfgtypes = array('show', 'keep');
-$cfgfiles = array('skip', 'php', 'clean');
+$cfgfiles = array('skip', 'php', 'clean', 'out', 'diff', 'exp');
$cfg = array();
foreach($cfgtypes as $type) {
$cfg[$type] = array();
@@ -285,11 +285,28 @@
$switch = substr($argv[$i],1,1);
$repeat = substr($argv[$i],0,1) == '-';
while ($repeat) {
- $repeat = false;
if (!$is_switch) {
$switch = substr($argv[$i],1,1);
}
$is_switch = true;
+ if ($repeat) {
+ foreach($cfgtypes as $type) {
+ if (strpos($switch, '--'.$type) === 0) {
+ foreach($cfgfiles as $file) {
+ if ($switch ==
'--'.$type.'-'.$file) {
+
$cfg[$type][$file] = true;
+ $is_switch =
false;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (!$is_switch) {
+ $is_switch = true;
+ break;
+ }
+ $repeat = false;
switch($switch) {
case 'r':
case 'l':
@@ -327,15 +344,6 @@
$cfg['keep'][$file] = true;
}
break;
- case '--keep-skip':
- $cfg['keep']['skip'] = true;
- break;
- case '--keep-php':
- $cfg['keep']['php'] = true;
- break;
- case '--keep-clean':
- $cfg['keep']['clean'] = true;
- break;
//case 'l'
case 'm':
$leak_check = true;
@@ -369,15 +377,6 @@
$cfg['show'][$file] = true;
}
break;
- case '--show-skip':
- $cfg['show']['skip'] = true;
- break;
- case '--show-php':
- $cfg['show']['php'] = true;
- break;
- case '--show-clean':
- $cfg['show']['clean'] = true;
- break;
case '--temp-source':
$temp_source = $argv[++$i];
break;
@@ -407,7 +406,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.4
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.5
$'.\n;
exit(1);
case 'u':
@@ -425,8 +424,8 @@
php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
janiWed Nov 21 08:20:22 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: MFH:- Fixed bug #43035: ignore_repeated_errors=On causes lot of tests to fail http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.2r2=1.226.2.37.2.35.2.3diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.2 php-src/run-tests.php:1.226.2.37.2.35.2.3 --- php-src/run-tests.php:1.226.2.37.2.35.2.2 Mon Nov 12 18:26:37 2007 +++ php-src/run-tests.php Wed Nov 21 08:20:22 2007 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.2 2007/11/12 18:26:37 zoe Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.3 2007/11/21 08:20:22 jani 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 @@ -174,6 +174,7 @@ 'auto_prepend_file=', 'auto_append_file=', 'magic_quotes_runtime=0', + 'ignore_repeated_errors=0', ); function write_information($show_html) @@ -400,7 +401,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.2 $'.\n; + echo '$Revision: 1.226.2.37.2.35.2.3 $'.\n; exit(1); case 'u': -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
zoe Mon Nov 12 18:26:37 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Changing the regex for %f so the it will match E-, E+ and E.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.1r2=1.226.2.37.2.35.2.2diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.1
php-src/run-tests.php:1.226.2.37.2.35.2.2
--- php-src/run-tests.php:1.226.2.37.2.35.2.1 Tue Nov 6 14:38:10 2007
+++ php-src/run-tests.php Mon Nov 12 18:26:37 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.1 2007/11/06 14:38:10 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.2 2007/11/12 18:26:37 zoe 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
@@ -400,7 +400,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.1
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.2
$'.\n;
exit(1);
case 'u':
@@ -1494,7 +1494,7 @@
$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('%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
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
helly Tue Nov 6 14:38:11 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: - Add hash bang line http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35r2=1.226.2.37.2.35.2.1diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35 php-src/run-tests.php:1.226.2.37.2.35.2.1 --- php-src/run-tests.php:1.226.2.37.2.35 Fri Sep 14 15:28:03 2007 +++ php-src/run-tests.php Tue Nov 6 14:38:10 2007 @@ -1,3 +1,4 @@ +#!/usr/bin/php ?php /* +--+ @@ -23,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35 2007/09/14 15:28:03 nlopess Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.1 2007/11/06 14:38:10 helly 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 @@ -399,7 +400,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35 $'.\n; + echo '$Revision: 1.226.2.37.2.35.2.1 $'.\n; exit(1); case 'u': -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
