svn: /web/php-gcov/trunk/ cron/cron.php cron/graph.php cron/tests.php www/stats.php
| From: | Felipe Pena | Date: | Sun, 11 Sep 2011 15:59:29 +0000 |
| Subject: | svn: /web/php-gcov/trunk/ cron/cron.php cron/graph.php cron/tests.php www/stats.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-12166@lists.php.net to get a copy of this message | ||
felipe Sun, 11 Sep 2011 15:59:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316500
Log:
- Separated information about failure/expected failure in the stats
Changed paths:
U web/php-gcov/trunk/cron/cron.php
U web/php-gcov/trunk/cron/graph.php
U web/php-gcov/trunk/cron/tests.php
U web/php-gcov/trunk/www/stats.php
Modified: web/php-gcov/trunk/cron/cron.php
===================================================================
--- web/php-gcov/trunk/cron/cron.php 2011-09-11 13:58:27 UTC (rev 316499)
+++ web/php-gcov/trunk/cron/cron.php 2011-09-11 15:59:29 UTC (rev 316500)
@@ -120,8 +120,8 @@
// This data is used mainly for the graph generation
$stmt = null;
- $sql = 'INSERT INTO local_builds (build_id, version_id, build_datetime, build_numerrors,
build_numwarnings, build_numfailures, build_numleaks, build_percent_code_coverage, build_os_info,
build_compiler_info) '.
- 'VALUES (NULL, :version_id, :build_datetime, :build_numerrors, :build_numwarnings,
:build_numfailures, :build_numleaks, :build_percent_code_coverage, :build_os_info,
:build_compiler_info) ';
+ $sql = 'INSERT INTO local_builds (build_id, version_id, build_datetime, build_numerrors,
build_numwarnings, build_numfailures, build_numleaks, build_percent_code_coverage, build_os_info,
build_compiler_info, build_numfailures) '.
+ 'VALUES (NULL, :version_id, :build_datetime, :build_numerrors, :build_numwarnings,
:build_numfailures, :build_numleaks, :build_percent_code_coverage, :build_os_info,
:build_compiler_info, :build_numfailures) ';
$stmt = $mysqlconn->prepare($sql);
$stmt->bindParam(':version_id', $version_id);
@@ -133,6 +133,7 @@
$stmt->bindParam(':build_percent_code_coverage', $codecoverage_percent);
$stmt->bindParam(':build_os_info', $osinfo);
$stmt->bindParam(':build_compiler_info', $compilerinfo);
+ $stmt->bindParam(':build_numxfailures', $totalnumxfailures);
$stmt->execute();
require $workdir.'/graph.php';
Modified: web/php-gcov/trunk/cron/graph.php
===================================================================
--- web/php-gcov/trunk/cron/graph.php 2011-09-11 13:58:27 UTC (rev 316499)
+++ web/php-gcov/trunk/cron/graph.php 2011-09-11 15:59:29 UTC (rev 316500)
@@ -74,7 +74,7 @@
try
{
- $sql = "SELECT $sqlgroup(build_datetime), avg(build_percent_code_coverage),
avg(build_numwarnings), avg(build_numfailures), avg(build_numleaks) FROM local_builds WHERE
DATE_SUB(CURDATE() , INTERVAL ? DAY) <= build_datetime AND version_id=? GROUP BY
$sqlgroup(build_datetime) ORDER BY build_datetime";
+ $sql = "SELECT $sqlgroup(build_datetime), avg(build_percent_code_coverage),
avg(build_numwarnings), avg(build_numfailures+build_numxfailures), avg(build_numleaks) FROM
local_builds WHERE DATE_SUB(CURDATE() , INTERVAL ? DAY) <= build_datetime AND version_id=? GROUP
BY $sqlgroup(build_datetime) ORDER BY build_datetime";
$stmt = $mysqlconn->prepare($sql);
$stmt->execute(array($graph_days, $version_id));
}
Modified: web/php-gcov/trunk/cron/tests.php
===================================================================
--- web/php-gcov/trunk/cron/tests.php 2011-09-11 13:58:27 UTC (rev 316499)
+++ web/php-gcov/trunk/cron/tests.php 2011-09-11 15:59:29 UTC (rev 316500)
@@ -48,13 +48,15 @@
$expected = @file_get_contents($report_file.'exp');
$output = @file_get_contents($report_file.'out');
$script = @file_get_contents($base.'php');
-
- ++$totalnumfailures;
if (strpos($status, 'XFAIL') !== false) {
$xfail_tests[$test['file']] = array($title, $difference, $expected, $output, $script);
+
+ ++$totalnumxfailures;
} else {
$fail_tests[$test['file']] = array($title, $difference, $expected, $output, $script);
+
+ ++$totalnumfailures;
}
}
Modified: web/php-gcov/trunk/www/stats.php
===================================================================
--- web/php-gcov/trunk/www/stats.php 2011-09-11 13:58:27 UTC (rev 316499)
+++ web/php-gcov/trunk/www/stats.php 2011-09-11 15:59:29 UTC (rev 316500)
@@ -38,11 +38,12 @@
$stmt->execute(array($version));
$data = $stmt->fetch();
-$c_errors = $data['build_numerrors'];
-$c_warns = $data['build_numwarnings'];
-$coverage = $data['build_percent_code_coverage'];
-$test_failures = $data['build_numfailures'];
-$valgrind = $data['build_numleaks'];
+$c_errors = $data['build_numerrors'];
+$c_warns = $data['build_numwarnings'];
+$coverage = $data['build_percent_code_coverage'];
+$test_failures = $data['build_numfailures'];
+$test_xfailures = $data['build_numxfailures'];
+$valgrind = $data['build_numleaks'];
$content = <<< HTML
@@ -69,6 +70,10 @@
$content .= "<b>Test Failures:</b> $test_failures<br/>\n";
}
+if ($test_xfailures !== NULL) {
+ $content .= "<b>Expected Test Failures:</b> $test_xfailures<br/>\n";
+}
+
if ($valgrind !== NULL) {
$content .= "<b>Valgrind Reports:</b> $valgrind<br/>\n";
}