Unreviewed build fixes.

* public/include/manifest.php:
(Manifest::generate): These should be {} instead of [] when they're empty.
* public/v2/data.js:
(Measurement.prototype.formattedRevisions): Don't assume previousRevisions[repositoryId] exits.
* public/v2/manifest.js:
(App.Metric.fullName): Fixed the typo.
* tests/admin-regenerate-manifest.js: Fixed the test.

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

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index c09beb3a6d63bae025948dfa59a4b810e5846c5f..3ba42b7d2ba4160cef89cd813031fd5db6677f94 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,15 @@
+2015-03-19  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed build fixes.
+
+        * public/include/manifest.php:
+        (Manifest::generate): These should be {} instead of [] when they're empty.
+        * public/v2/data.js:
+        (Measurement.prototype.formattedRevisions): Don't assume previousRevisions[repositoryId] exits.
+        * public/v2/manifest.js:
+        (App.Metric.fullName): Fixed the typo.
+        * tests/admin-regenerate-manifest.js: Fixed the test.
+
 2015-02-20  Ryosuke Niwa  <rniwa@webkit.org>
 
         Commit the erroneously reverted change.

diff --git a/Websites/perf.webkit.org/public/include/manifest.php b/Websites/perf.webkit.org/public/include/manifest.php
index 538410a021b021a0c6fe1cd101fb0789ec4ed681..d36763b738ae12a40a02ca4d04e408873480a76b 100644 (file)
--- a/Websites/perf.webkit.org/public/include/manifest.php
+++ b/Websites/perf.webkit.org/public/include/manifest.php
@@ -27,14 +27,14 @@ class ManifestGenerator {
             $row = $row['commit_repository'];
 
         $this->manifest = array(
-            'tests' => $this->tests(),
-            'metrics' => $this->metrics(),
-            'all' => $this->platforms($config_table, $platform_table, false),
-            'dashboard' => $this->platforms($config_table, $platform_table, true),
-            'repositories' => $this->repositories($repositories_table, $repositories_with_commit),
-            'builders' => $this->builders(),
-            'bugTrackers' => $this->bug_trackers($repositories_table),
-            'dashboards' => config('dashboards'),
+            'tests' => (object)$this->tests(),
+            'metrics' => (object)$this->metrics(),
+            'all' => (object)$this->platforms($config_table, $platform_table, false),
+            'dashboard' => (object)$this->platforms($config_table, $platform_table, true),
+            'repositories' => (object)$this->repositories($repositories_table, $repositories_with_commit),
+            'builders' => (object)$this->builders(),
+            'bugTrackers' => (object)$this->bug_trackers($repositories_table),
+            'dashboards' => (object)config('dashboards'),
         );
 
         $this->manifest['elapsedTime'] = (microtime(true) - $start_time) * 1000;

diff --git a/Websites/perf.webkit.org/public/v2/data.js b/Websites/perf.webkit.org/public/v2/data.js
index f2ee899ab177c14d09f9f602d776702422501a39..a6e4af604c23eef798c08d45f155d7daeb7d62db 100755 (executable)
--- a/Websites/perf.webkit.org/public/v2/data.js
+++ b/Websites/perf.webkit.org/public/v2/data.js
@@ -173,7 +173,7 @@ Measurement.prototype.formattedRevisions = function (previousMeasurement)
     var formattedRevisions = {};
     for (var repositoryId in revisions) {
         var currentRevision = revisions[repositoryId][0];
-        var previousRevision = previousRevisions ? previousRevisions[repositoryId][0] : null;
+        var previousRevision = previousRevisions && previousRevisions[repositoryId] ? previousRevisions[repositoryId][0] : null;
         var formatttedRevision = Measurement.formatRevisionRange(currentRevision, previousRevision);
         formattedRevisions[repositoryId] = formatttedRevision;
     }

diff --git a/Websites/perf.webkit.org/public/v2/manifest.js b/Websites/perf.webkit.org/public/v2/manifest.js
index 9d03bf232f83f94e62511bc8d9b62b6836affb21..4059b2fc3c05e9de10775cf24f2e4add3ce4daca 100755 (executable)
--- a/Websites/perf.webkit.org/public/v2/manifest.js
+++ b/Websites/perf.webkit.org/public/v2/manifest.js
@@ -34,7 +34,7 @@ App.Metric = App.NameLabelModel.extend({
     }.property('name', 'test'),
     fullName: function ()
     {
-        return this.get('path').join(' \u220b ') /* ∈ */
+        return this.get('path').join(' \u220b ') /* ∋ */
             + ' : ' + this.get('label');
     }.property('path', 'label'),
 });

diff --git a/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js b/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
index f4dc6ae1fa0a470dcfbc6588f8860a2a694b081b..6f8928ae3e20e1ad13be531fa890caf77e3d9d2e 100644 (file)
--- a/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
+++ b/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
@@ -8,14 +8,15 @@ describe("/admin/regenerate-manifest", function () {
                 var manifest = JSON.parse(response.responseText);
                 delete manifest.defaultDashboard;
                 delete manifest.dashboards;
+                delete manifest.elapsedTime;
                 assert.deepEqual(manifest, {
-                    all: [],
-                    bugTrackers: [],
-                    builders: [],
-                    dashboard: [],
-                    metrics: [],
-                    repositories: [],
-                    tests: []});
+                    all: {},
+                    bugTrackers: {},
+                    builders: {},
+                    dashboard: {},
+                    metrics: {},
+                    repositories: {},
+                    tests: {}});
                 notifyDone();
             });
         });