Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js (171332 => 171333)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js 2014-07-22 01:26:24 UTC (rev 171332)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js 2014-07-22 02:15:46 UTC (rev 171333)
@@ -69,7 +69,7 @@
var apiTestResults = iteration.apiTestResults || {failureCount: 0};
var platformAPITestResults = iteration.platformAPITestResults || {failureCount: 0};
var pythonTestResults = iteration.pythonTestResults || {failureCount: 0};
- var perlTestResults = iteration.perlTestResults || {failureCount: 0};
+ var perlTestResults = iteration.perlTestResults || {errorOccurred: false};
var bindingTestResults = iteration.bindingTestResults || {errorOccurred: false};
if (iteration.successful) {
@@ -78,35 +78,35 @@
} else if (!iteration.productive) {
var url = ""
var status = new StatusLineView(messageElement, StatusLineView.Status.Danger, iteration.text, undefined, url);
- } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+ } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.errorOccurred && !bindingTestResults.errorOccurred) {
// Something wrong happened, but it was not a test failure.
var url = ""
var status = new StatusLineView(messageElement, StatusLineView.Status.Danger, iteration.text, undefined, url);
- } else if (layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+ } else if (layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.errorOccurred && !bindingTestResults.errorOccurred) {
var url = ""
var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, layoutTestResults.failureCount === 1 ? "layout test failure" : "layout test failures", layoutTestResults.tooManyFailures ? layoutTestResults.failureCount + "\uff0b" : layoutTestResults.failureCount, url);
new PopoverTracker(status.statusBubbleElement, this._presentPopoverForLayoutTestRegressions.bind(this), iteration);
- } else if (!layoutTestResults.failureCount && _javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+ } else if (!layoutTestResults.failureCount && _javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.errorOccurred && !bindingTestResults.errorOccurred) {
var url = ""
var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, _javascript_TestResults.failureCount === 1 ? "_javascript_ test failure" : "_javascript_ test failures", _javascript_TestResults.failureCount, url);
- } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+ } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.errorOccurred && !bindingTestResults.errorOccurred) {
var url = ""
var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, apiTestResults.failureCount === 1 ? "api test failure" : "api test failures", apiTestResults.failureCount, url);
- } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+ } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.errorOccurred && !bindingTestResults.errorOccurred) {
var url = ""
var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, platformAPITestResults.failureCount === 1 ? "platform api test failure" : "api test failures", platformAPITestResults.failureCount, url);
- } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+ } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && pythonTestResults.failureCount && !perlTestResults.errorOccurred && !bindingTestResults.errorOccurred) {
var url = ""
var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, pythonTestResults.failureCount === 1 ? "webkitpy test failure" : "webkitpy test failures", pythonTestResults.failureCount, url);
- } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+ } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && perlTestResults.errorOccurred && !bindingTestResults.errorOccurred) {
var url = ""
- var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, perlTestResults.failureCount === 1 ? "webkitperl test failure" : "webkitperl test failures", perlTestResults.failureCount, url);
- } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && bindingTestResults.errorOccurred) {
+ var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, "webkitperl test failed", undefined, url);
+ } else if (!layoutTestResults.failureCount && !_javascript_TestResults.failureCount && !apiTestResults.failureCount && !platformAPITestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.errorOccurred && bindingTestResults.errorOccurred) {
var url = ""
var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, "bindings tests failed", undefined, url);
} else {
var url = ""
- var totalFailures = layoutTestResults.failureCount + _javascript_TestResults.failureCount + apiTestResults.failureCount + platformAPITestResults.failureCount + pythonTestResults.failureCount + perlTestResults.failureCount + bindingTestResults.errorOccurred;
+ var totalFailures = layoutTestResults.failureCount + _javascript_TestResults.failureCount + apiTestResults.failureCount + platformAPITestResults.failureCount + pythonTestResults.failureCount + perlTestResults.errorOccurred + bindingTestResults.errorOccurred;
var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, totalFailures === 1 ? "test failure" : "test failures", totalFailures, url);
new PopoverTracker(status.statusBubbleElement, this._presentPopoverForMultipleFailureKinds.bind(this), iteration);
}
@@ -284,7 +284,7 @@
var apiTestResults = iteration.apiTestResults || {failureCount: 0};
var platformAPITestResults = iteration.platformAPITestResults || {failureCount: 0};
var pythonTestResults = iteration.pythonTestResults || {failureCount: 0};
- var perlTestResults = iteration.perlTestResults || {failureCount: 0};
+ var perlTestResults = iteration.perlTestResults || {errorOccurred: false};
var bindingTestResults = iteration.bindingTestResults || {errorOccurred: false};
var content = document.createElement("div");
@@ -319,10 +319,8 @@
addResultKind(message, iteration.queue.buildbot.webkitpyTestResultsURLForIteration(iteration));
}
- if (perlTestResults.failureCount) {
- var message = perlTestResults.failureCount + "\u00a0" + (perlTestResults.failureCount === 1 ? "webkitperl test failure" : "webkitperl test failures");
- addResultKind(message, iteration.queue.buildbot.webkitperlTestResultsURLForIteration(iteration));
- }
+ if (perlTestResults.errorOccurred)
+ addResultKind("webkitperl tests failed", iteration.queue.buildbot.webkitperlTestResultsURLForIteration(iteration));
if (bindingTestResults.errorOccurred)
addResultKind("bindings tests failed", iteration.queue.buildbot.bindingsTestResultsURLForIteration(iteration));