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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@158005 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/test-results/ChangeLog b/Websites/test-results/ChangeLog
index efddb61..cbe0b67 100644 (file)
--- a/Websites/test-results/ChangeLog
+++ b/Websites/test-results/ChangeLog
@@ -1,5 +1,16 @@
 2013-10-25  Ryosuke Niwa  <rniwa@webkit.org>
 
+        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  <rniwa@webkit.org>
+
         Another build fix. Move .htaccess to public.
 
         * .htaccess: Removed.

diff --git a/Websites/test-results/public/api/report.php b/Websites/test-results/public/api/report.php
index dfa3458..76294b7 100644 (file)
--- a/Websites/test-results/public/api/report.php
+++ b/Websites/test-results/public/api/report.php
@@ -20,7 +20,7 @@ $build_number = intval($_POST['build_number']);
 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 @@ if (!store_test_results($db, $test_results, $build_id, $start_time, $end_time, $
 
 echo_success();
 
-ob_end_flush();
+@ob_end_flush();
 flush();
 if (function_exists('fastcgi_finish_request'))
     fastcgi_finish_request();

diff --git a/Websites/test-results/public/include/test-results.php b/Websites/test-results/public/include/test-results.php
index 7367844..1634217 100644 (file)
--- a/Websites/test-results/public/include/test-results.php
+++ b/Websites/test-results/public/include/test-results.php
@@ -62,8 +62,8 @@ function recursively_add_test_results($db, $build_id, $tests, $full_name) {
         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)