svn: /web/qa/trunk/ buildtest-process.php reports/parserfunc.php
| From: | Philip Olson | Date: | Thu, 16 Jun 2011 22:42:41 +0000 |
| Subject: | svn: /web/qa/trunk/ buildtest-process.php reports/parserfunc.php | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-65818@lists.php.net to get a copy of this message | ||
philip Thu, 16 Jun 2011 22:42:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312217
Log:
Bypass reports/ PHP version regex check, if QA PHP version is known. See also @todo.
Changed paths:
U web/qa/trunk/buildtest-process.php
U web/qa/trunk/reports/parserfunc.php
Modified: web/qa/trunk/buildtest-process.php
===================================================================
--- web/qa/trunk/buildtest-process.php 2011-06-16 22:22:58 UTC (rev 312216)
+++ web/qa/trunk/buildtest-process.php 2011-06-16 22:42:41 UTC (rev 312217)
@@ -30,7 +30,7 @@
// Aggregator (http://qa.php.net/reports/)
include 'reports/parserfunc.php';
$array = parse_phpmaketest($version, $status, base64_decode($_POST['php_test_data']));
- insertToDb_phpmaketest($array);
+ insertToDb_phpmaketest($array, $QA_RELEASES);
}
}
Modified: web/qa/trunk/reports/parserfunc.php
===================================================================
--- web/qa/trunk/reports/parserfunc.php 2011-06-16 22:22:58 UTC (rev 312216)
+++ web/qa/trunk/reports/parserfunc.php 2011-06-16 22:42:41 UTC (rev 312217)
@@ -16,7 +16,7 @@
# +----------------------------------------------------------------------+
# $Id$
-function insertToDb_phpmaketest($array)
+function insertToDb_phpmaketest($array, $QA_RELEASES = array())
{
if (!is_array($array)) {
// impossible to fetch data. We'll record this error later ...
@@ -36,8 +36,11 @@
else
die('status unknown: '.$array['status']);
- if (!preg_match('@^[0-9]{1}\.[0-9]{1}\.[0-9\.\-dev]{1,}$@',
$array['version'])) {
- return;
+ //@todo Consider alpha/beta/RC for regex
+ if (!in_array($array['version'], $QA_RELEASES['reported'])) {
+ if (!preg_match('@^[0-9]{1}\.[0-9]{1}\.[0-9\.\-dev]{1,}$@',
$array['version'])) {
+ return;
+ }
}
$DBFILE =
dirname(__FILE__).'/db/'.$array['version'].'.sqlite';