Unreviewed build fix after r174555.

* public/include/manifest.php:
(ManifestGenerator::generate): Assign an empty array to $repositories_with_commit when there are no commits.
* tests/admin-regenerate-manifest.js: Fixed the test case.

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

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index b5156b9ec7d2c86bde121a253d6fc427af567cda..9579ecea61a699da6560b3bceb30883e42d074fa 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed build fix after r174555.
+
+        * public/include/manifest.php:
+        (ManifestGenerator::generate): Assign an empty array to $repositories_with_commit when there are no commits.
+        * tests/admin-regenerate-manifest.js: Fixed the test case.
+
 2014-10-09  Ryosuke Niwa  <rniwa@webkit.org>
 
         New perf dashboard UI tries to fetch commits all the time

diff --git a/Websites/perf.webkit.org/public/include/manifest.php b/Websites/perf.webkit.org/public/include/manifest.php
index c91cb1d8747945f5f03c39c214349a2f95649814..269b3a84c8d8b7bce5adc8ee103d3b410b314dfe 100644 (file)
--- a/Websites/perf.webkit.org/public/include/manifest.php
+++ b/Websites/perf.webkit.org/public/include/manifest.php
@@ -17,7 +17,10 @@ class ManifestGenerator {
         $repositories_table = $this->db->fetch_table('repositories');
 
         $repositories_with_commit = $this->db->query_and_fetch_all(
-            'SELECT DISTINCT(commit_repository) FROM commits WHERE commit_reported IS TRUE') or array();
+            'SELECT DISTINCT(commit_repository) FROM commits WHERE commit_reported IS TRUE');
+        if (!$repositories_with_commit)
+            $repositories_with_commit = array();
+
         foreach ($repositories_with_commit as &$row)
             $row = $row['commit_repository'];
 

diff --git a/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js b/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
index dc09b485e51a8cba2561ca1a03a36dfd1f0d353a..ed5a29511efbd421b63c0c6592d7e84778be724a 100644 (file)
--- a/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
+++ b/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
@@ -45,8 +45,8 @@ describe("/admin/regenerate-manifest", function () {
                             assert.equal(response.statusCode, 200);
                             var manifest = JSON.parse(response.responseText);
                             assert.deepEqual(manifest['repositories'], {
-                                'WebKit': { url: 'trac.webkit.org', blameUrl: null },
-                                'Chromium': { url: null, blameUrl: 'SomeBlameURL' }
+                                'WebKit': { url: 'trac.webkit.org', blameUrl: null, hasReportedCommits: false },
+                                'Chromium': { url: null, blameUrl: 'SomeBlameURL', hasReportedCommits: false }
                             });
                             assert.deepEqual(manifest['bugTrackers']['Bugzilla'], { newBugUrl: null, repositories: ['WebKit'] });
                             assert.deepEqual(manifest['bugTrackers']['Issue Tracker'], { newBugUrl: null, repositories: ['WebKit', 'Chromium'] });