Title: [174659] trunk/Websites/perf.webkit.org
Revision
174659
Author
[email protected]
Date
2014-10-13 14:58:30 -0700 (Mon, 13 Oct 2014)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Websites/perf.webkit.org/ChangeLog (174658 => 174659)


--- trunk/Websites/perf.webkit.org/ChangeLog	2014-10-13 21:33:22 UTC (rev 174658)
+++ trunk/Websites/perf.webkit.org/ChangeLog	2014-10-13 21:58:30 UTC (rev 174659)
@@ -1,3 +1,11 @@
+2014-10-13  Ryosuke Niwa  <[email protected]>
+
+        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  <[email protected]>
 
         New perf dashboard UI tries to fetch commits all the time

Modified: trunk/Websites/perf.webkit.org/public/include/manifest.php (174658 => 174659)


--- trunk/Websites/perf.webkit.org/public/include/manifest.php	2014-10-13 21:33:22 UTC (rev 174658)
+++ trunk/Websites/perf.webkit.org/public/include/manifest.php	2014-10-13 21:58:30 UTC (rev 174659)
@@ -17,7 +17,10 @@
         $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'];
 

Modified: trunk/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js (174658 => 174659)


--- trunk/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js	2014-10-13 21:33:22 UTC (rev 174658)
+++ trunk/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js	2014-10-13 21:58:30 UTC (rev 174659)
@@ -45,8 +45,8 @@
                             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'] });
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to