- Revision
- 94486
- Author
- [email protected]
- Date
- 2011-09-03 01:27:38 -0700 (Sat, 03 Sep 2011)
Log Message
garden-o-matic results view should show Actual and Expected results for text failures
https://bugs.webkit.org/show_bug.cgi?id=67536
Reviewed by Eric Seidel.
In the past, we didn't show actual and expected text results (we just
showed the diff) because we didn't have the awesome six-by-two results
grid. Now that we do, we can move show these results.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js:
- Fixed some typos that were preventing these unit tests from running.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js:
(.):
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js:
- Report -actual.txt and -expected.txt as possible results URLs.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js (94485 => 94486)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js 2011-09-03 08:25:33 UTC (rev 94485)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js 2011-09-03 08:27:38 UTC (rev 94486)
@@ -85,6 +85,8 @@
base.flattenArray = function(arrayOfArrays)
{
+ if (!arrayOfArrays.length)
+ return [];
return arrayOfArrays.reduce(function(left, right) {
return left.concat(right);
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js (94485 => 94486)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js 2011-09-03 08:25:33 UTC (rev 94485)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js 2011-09-03 08:27:38 UTC (rev 94486)
@@ -75,9 +75,9 @@
test("flattenArray", 5, function() {
deepEqual(base.flattenArray([]), []);
deepEqual(base.flattenArray([["a"]]), ["a"]);
- deepEqual(base.flattenArray([["a",] ["b"]]), ["a", "b"]);
+ deepEqual(base.flattenArray([["a"], ["b"]]), ["a", "b"]);
deepEqual(base.flattenArray([["a"], ["b", "c"]]), ["a", "b", "c"]);
- deepEqual(base.flattenArray(["a"], [], ["b"]]), ["a", "b"]);
+ deepEqual(base.flattenArray([["a"], [], ["b"]]), ["a", "b"]);
});
test("callInParallel", 4, function() {
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js (94485 => 94486)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js 2011-09-03 08:25:33 UTC (rev 94485)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js 2011-09-03 08:27:38 UTC (rev 94486)
@@ -48,7 +48,9 @@
var kExpectedImageSuffix = '-expected.png';
var kActualImageSuffix = '-actual.png';
var kImageDiffSuffix = '-diff.png';
-var kTextDiffSuffix = '-diff.txt';
+var kExpectedTextSuffix = '-expected.txt';
+var kActualTextSuffix = '-actual.txt';
+var kDiffTextSuffix = '-diff.txt';
var kCrashLogSuffix = '-crash-log.txt';
var kPNGExtension = 'png';
@@ -58,7 +60,9 @@
kExpectedImageSuffix,
kActualImageSuffix,
kImageDiffSuffix,
- kTextDiffSuffix,
+ kExpectedTextSuffix,
+ kActualTextSuffix,
+ kDiffTextSuffix,
kCrashLogSuffix,
// FIXME: Add support for the rest of the result types.
];
@@ -107,9 +111,9 @@
function pushTextSuffixes()
{
- // '-expected.txt',
- // '-actual.txt',
- suffixList.push(kTextDiffSuffix);
+ suffixList.push(kActualTextSuffix);
+ suffixList.push(kExpectedTextSuffix);
+ suffixList.push(kDiffTextSuffix);
// '-wdiff.html',
// '-pretty-diff.html',
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js (94485 => 94486)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js 2011-09-03 08:25:33 UTC (rev 94485)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js 2011-09-03 08:27:38 UTC (rev 94486)
@@ -405,7 +405,9 @@
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.png",
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.png",
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.png",
- "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt"
+ "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.txt",
+ "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.txt",
+ "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt",
]);
});
});
@@ -418,7 +420,9 @@
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.png",
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.png",
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.png",
- "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt"
+ "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.txt",
+ "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.txt",
+ "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt",
]);
});
Modified: trunk/Tools/ChangeLog (94485 => 94486)
--- trunk/Tools/ChangeLog 2011-09-03 08:25:33 UTC (rev 94485)
+++ trunk/Tools/ChangeLog 2011-09-03 08:27:38 UTC (rev 94486)
@@ -1,5 +1,24 @@
2011-09-03 Adam Barth <[email protected]>
+ garden-o-matic results view should show Actual and Expected results for text failures
+ https://bugs.webkit.org/show_bug.cgi?id=67536
+
+ Reviewed by Eric Seidel.
+
+ In the past, we didn't show actual and expected text results (we just
+ showed the diff) because we didn't have the awesome six-by-two results
+ grid. Now that we do, we can move show these results.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js:
+ - Fixed some typos that were preventing these unit tests from running.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js:
+ (.):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js:
+ - Report -actual.txt and -expected.txt as possible results URLs.
+
+2011-09-03 Adam Barth <[email protected]>
+
garden-o-matic shows "ghost" failures that are already fixed
https://bugs.webkit.org/show_bug.cgi?id=67535
