Title: [158005] trunk/Websites/test-results
- Revision
- 158005
- Author
- [email protected]
- Date
- 2013-10-25 05:43:42 -0700 (Fri, 25 Oct 2013)
Log Message
Yet another set of build fixes.
1. Manually strip / from revisions JSON if there is any.
2. Suppress warnings from ob_end_flush.
3. Allow "+" in actual and expected results as used in "TEXT+IMAGE".
* public/api/report.php:
* public/include/test-results.php:
Modified Paths
Diff
Modified: trunk/Websites/test-results/ChangeLog (158004 => 158005)
--- trunk/Websites/test-results/ChangeLog 2013-10-25 12:28:15 UTC (rev 158004)
+++ trunk/Websites/test-results/ChangeLog 2013-10-25 12:43:42 UTC (rev 158005)
@@ -1,5 +1,16 @@
2013-10-25 Ryosuke Niwa <[email protected]>
+ Yet another set of build fixes.
+
+ 1. Manually strip / from revisions JSON if there is any.
+ 2. Suppress warnings from ob_end_flush.
+ 3. Allow "+" in actual and expected results as used in "TEXT+IMAGE".
+
+ * public/api/report.php:
+ * public/include/test-results.php:
+
+2013-10-25 Ryosuke Niwa <[email protected]>
+
Another build fix. Move .htaccess to public.
* .htaccess: Removed.
Modified: trunk/Websites/test-results/public/api/report.php (158004 => 158005)
--- trunk/Websites/test-results/public/api/report.php 2013-10-25 12:28:15 UTC (rev 158004)
+++ trunk/Websites/test-results/public/api/report.php 2013-10-25 12:43:42 UTC (rev 158005)
@@ -20,7 +20,7 @@
if (!array_key_exists('file', $_FILES) or !array_key_exists('tmp_name', $_FILES['file']) or count($_FILES['file']['tmp_name']) <= 0)
exit_with_error('ResultsJSONNotIncluded');
-$revisions = json_decode($_POST['revisions'], true);
+$revisions = json_decode(str_replace('\\', '', $_POST['revisions']), TRUE);
foreach ($revisions as $repository_name => $revision_data) {
require_format('repository_name', $repository_name, '/^\w+$/');
require_existence_of($revision_data, array(
@@ -64,7 +64,7 @@
echo_success();
-ob_end_flush();
+@ob_end_flush();
flush();
if (function_exists('fastcgi_finish_request'))
fastcgi_finish_request();
Modified: trunk/Websites/test-results/public/include/test-results.php (158004 => 158005)
--- trunk/Websites/test-results/public/include/test-results.php 2013-10-25 12:28:15 UTC (rev 158004)
+++ trunk/Websites/test-results/public/include/test-results.php 2013-10-25 12:43:42 UTC (rev 158005)
@@ -62,8 +62,8 @@
return;
}
- require_format('expected_result', $tests['expected'], '/^[A-Za-z ]+$/');
- require_format('actual_result', $tests['actual'], '/^[A-Za-z ]+$/');
+ require_format('expected_result', $tests['expected'], '/^[A-Za-z \+]+$/');
+ require_format('actual_result', $tests['actual'], '/^[A-Za-z \+]+$/');
require_format('test_time', $tests['time'], '/^\d*$/');
$modifiers = array_get($tests, 'modifiers');
if ($modifiers)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
