Changeset 89840 in webkit

Timestamp:

Jun 27, 2011 11:28:36 AM (13 years ago)

Author:

Adam Roben

Message:

Make TestFailures load build names from build.webkit.org/old-results too

Build results are periodically moved from results to old-results. This change makes those
builds still visible to TestFailures.

Fixes <​http://webkit.org/b/63453> TestFailures page doesn't show information for builds that
have been moved to build.webkit.org/old-results

Reviewed by Anders Carlsson.

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js:

(Builder.prototype.getBuildNames): Extracted code to parse build names from a
build.webkit.org directory listing into a separate function. Instead of omitting .zip files,
we now only include directory entries whose names are parseable as build names (since
old-results sometimes contains other random files/directories from who knows what). We now
fetch both results and old-results (with a FIXME about loading old-results on demand),
extract build names from each, and concatenate the two sets of names.

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/WebKitBuildbot.js:

(WebKitBuildbot.prototype.parseBuildName): Changed to return null when the build name isn't
parseable, rather than throwing an exception.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/WebKitBuildbot.js (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js

@@ -178 +178 @@
 
         var self = this;
-        getResource(this.buildbot.baseURL + 'results/' + this.name, function(xhr) {
+
+        function buildNamesFromDirectoryXHR(xhr) {
             var root = document.createElement('html');
             root.innerHTML = xhr.responseText;
@@ -185 +186 @@
                 return elem.innerText.replace(/\/$/, '');
             }).filter(function(filename) {
-                return !/\.zip$/.test(filename);
+                return self.buildbot.parseBuildName(filename);
             });
             buildNames.reverse();
 
-            self._cache[cacheKey] = buildNames;
-            callback(buildNames);
+            return buildNames;
+        }
+
+        getResource(self.buildbot.baseURL + 'results/' + self.name, function(xhr) {
+            // FIXME: It would be better for performance if we could avoid loading old-results until needed.
+            getResource(self.buildbot.baseURL + 'old-results/' + self.name, function(oldXHR) {
+                var buildNames = buildNamesFromDirectoryXHR(xhr).concat(buildNamesFromDirectoryXHR(oldXHR));
+                self._cache[cacheKey] = buildNames;
+                callback(buildNames);
+            });
         });
     },

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/WebKitBuildbot.js

@@ -31 +31 @@
     parseBuildName: function(buildName) {
         var match = /^r(\d+) \((\d+)\)$/.exec(buildName);
+        if (!match)
+            return null;
         return {
             revision: parseInt(match[1], 10),

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-27  Adam Roben  <aroben@apple.com>
+
+        Make TestFailures load build names from build.webkit.org/old-results too
+
+        Build results are periodically moved from results to old-results. This change makes those
+        builds still visible to TestFailures.
+
+        Fixes <http://webkit.org/b/63453> TestFailures page doesn't show information for builds that
+        have been moved to build.webkit.org/old-results
+
+        Reviewed by Anders Carlsson.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js:
+        (Builder.prototype.getBuildNames): Extracted code to parse build names from a
+        build.webkit.org directory listing into a separate function. Instead of omitting .zip files,
+        we now only include directory entries whose names are parseable as build names (since
+        old-results sometimes contains other random files/directories from who knows what). We now
+        fetch both results and old-results (with a FIXME about loading old-results on demand),
+        extract build names from each, and concatenate the two sets of names.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/WebKitBuildbot.js:
+        (WebKitBuildbot.prototype.parseBuildName): Changed to return null when the build name isn't
+        parseable, rather than throwing an exception.
+
 2011-06-26  Adam Roben  <aroben@apple.com>