cvs: php-gcov-web /cron tests.php /www tests.php valgrind.php
| From: | Nuno Lopes | Date: | Wed, 11 Jun 2008 17:50:37 +0000 |
| Subject: | cvs: php-gcov-web /cron tests.php /www tests.php valgrind.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-1912@lists.php.net to get a copy of this message | ||
nlopess Wed Jun 11 17:50:37 2008 UTC
Modified files:
/php-gcov-web/cron tests.php
/php-gcov-web/www tests.php valgrind.php
Log:
kill unicode switch support
http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/tests.php?r1=1.8&r2=1.9&diff_format=u
Index: php-gcov-web/cron/tests.php
diff -u php-gcov-web/cron/tests.php:1.8 php-gcov-web/cron/tests.php:1.9
--- php-gcov-web/cron/tests.php:1.8 Thu Aug 9 13:29:51 2007
+++ php-gcov-web/cron/tests.php Wed Jun 11 17:50:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tests.php,v 1.8 2007/08/09 13:29:51 nlopess Exp $ */
+/* $Id: tests.php,v 1.9 2008/06/11 17:50:36 nlopess Exp $ */
// Tests generation file
// $data: contains the contents of $tmpdir/php_test.log
@@ -26,7 +26,7 @@
$fail_tests = array();
$skip_tests = array();
$valgrind = array();
-$tests_re = '/\r(?P<status>[A-Z&]+)(?::(?P<testtype>[UN]))?
(?P<title>.+) \[(?P<file>[^\]]+\.phpt)\](?: reason:[\s:.]+(?P<reason>.+))?/';
+$tests_re = '/\r(?P<status>[A-Z&]+) (?P<title>.+)
\[(?P<file>[^\]]+\.phpt)\](?: reason:[\s:.]+(?P<reason>.+))?/S';
preg_match_all($tests_re, $data, $tests, PREG_SET_ORDER);
@@ -41,13 +41,6 @@
$report_file = $base;
- if (isset($test['testtype']) && $test['testtype'] === 'U') {
- $testtype = 'Unicode';
- $report_file .= 'u.';
- } else {
- $testtype = 'Native';
- }
-
// Failed tests provide more content then passed tests
if (strpos($status, 'FAIL') !== false) {
$difference = @file_get_contents($report_file.'diff');
@@ -57,15 +50,14 @@
++$totalnumfailures;
- $fail_tests[$test['file']] = array($testtype, $title, $difference, $expected, $output,
$script);
-
+ $fail_tests[$test['file']] = array($title, $difference, $expected, $output, $script);
}
if (strpos($status, 'LEAK') !== false) {
$report = @file_get_contents($report_file.'mem');
$script = @file_get_contents($base.'php');
- $valgrind[$test['file']] = array($title, $testtype, $script, $report);
+ $valgrind[$test['file']] = array($title, $script, $report);
}
if (strpos($status, 'SKIP') !== false) {
http://cvs.php.net/viewvc.cgi/php-gcov-web/www/tests.php?r1=1.5&r2=1.6&diff_format=u
Index: php-gcov-web/www/tests.php
diff -u php-gcov-web/www/tests.php:1.5 php-gcov-web/www/tests.php:1.6
--- php-gcov-web/www/tests.php:1.5 Fri Dec 29 20:53:17 2006
+++ php-gcov-web/www/tests.php Wed Jun 11 17:50:36 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tests.php,v 1.5 2006/12/29 20:53:17 nlopess Exp $ */
+/* $Id: tests.php,v 1.6 2008/06/11 17:50:36 nlopess Exp $ */
if (!defined('IN_GCOV_CODE')) exit;
@@ -36,11 +36,11 @@
if (isset($data[$file])) {
$data = $data[$file];
$file = htmlspecialchars($file);
- $title = htmlspecialchars($data[1]);
- $diff = htmlspecialchars($data[2]);
- $exp = htmlspecialchars($data[3]);
- $output = htmlspecialchars($data[4]);
- $script = highlight_php_numbered($data[5]);
+ $title = htmlspecialchars($data[0]);
+ $diff = htmlspecialchars($data[1]);
+ $exp = htmlspecialchars($data[2]);
+ $output = htmlspecialchars($data[3]);
+ $script = highlight_php_numbered($data[4]);
$appvars['page']['title'] = "PHP: $version Test Failure Report for
$file";
$appvars['page']['head'] = "Test Failure Report for $file
('$title')";
@@ -73,8 +73,7 @@
$dir = htmlspecialchars(dirname($path));
$file = htmlspecialchars(basename($path));
$urlfile = htmlspecialchars(urlencode($path));
- $type = htmlspecialchars($entry[0]);
- $title = htmlspecialchars($entry[1]);
+ $title = htmlspecialchars($entry[0]);
if ($dir !== $old_dir) {
$old_dir = $dir;
@@ -84,7 +83,6 @@
</tr>
<tr>
<td><b>File</b></td>
- <td><b>Type</b></td>
<td><b>Name</b></td>
</tr>
HTML;
@@ -93,7 +91,6 @@
$content .= <<< HTML
<tr>
<td><a
href="/viewer.php?version=$version&func=tests&file=$urlfile">$file</a></td>
- <td>$type</td>
<td>$title</td>
</tr>
HTML;
http://cvs.php.net/viewvc.cgi/php-gcov-web/www/valgrind.php?r1=1.4&r2=1.5&diff_format=u
Index: php-gcov-web/www/valgrind.php
diff -u php-gcov-web/www/valgrind.php:1.4 php-gcov-web/www/valgrind.php:1.5
--- php-gcov-web/www/valgrind.php:1.4 Fri Dec 29 20:53:17 2006
+++ php-gcov-web/www/valgrind.php Wed Jun 11 17:50:36 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: valgrind.php,v 1.4 2006/12/29 20:53:17 nlopess Exp $ */
+/* $Id: valgrind.php,v 1.5 2008/06/11 17:50:36 nlopess Exp $ */
if (!defined('IN_GCOV_CODE')) exit;
@@ -37,8 +37,8 @@
$data = $data[$file];
$file = htmlspecialchars($file);
$title = htmlspecialchars($data[0]);
- $script = highlight_php_numbered($data[2]);
- $report = htmlspecialchars($data[3]);
+ $script = highlight_php_numbered($data[1]);
+ $report = htmlspecialchars($data[2]);
$appvars['page']['title'] = "PHP: $version Valgrind Report for
$file";
$appvars['page']['head'] = "Valgrind Report for $file
('$title')";
@@ -78,7 +78,6 @@
</tr>
<tr>
<td><b>File</b></td>
- <td><b>Type</b></td>
<td><b>Name</b></td>
</tr>
HTML;
@@ -87,7 +86,6 @@
$content .= <<< HTML
<tr>
<td><a
href="/viewer.php?version=$version&func=valgrind&file=$urlfile">$file</a></td>
- <td>$type</td>
<td>$title</td>
</tr>
HTML;