Changeset 94486 in webkit


Ignore:
Timestamp:
Sep 3, 2011 1:27:38 AM (13 years ago)
Author:
abarth@webkit.org
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.
Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js

    r94485 r94486  
    8686base.flattenArray = function(arrayOfArrays)
    8787{
     88    if (!arrayOfArrays.length)
     89        return [];
    8890    return arrayOfArrays.reduce(function(left, right) {
    8991        return left.concat(right); 

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js

    r94314 r94486  
    7676    deepEqual(base.flattenArray([]), []);
    7777    deepEqual(base.flattenArray([["a"]]), ["a"]);
    78     deepEqual(base.flattenArray([["a",] ["b"]]), ["a", "b"]);
     78    deepEqual(base.flattenArray([["a"], ["b"]]), ["a", "b"]);
    7979    deepEqual(base.flattenArray([["a"], ["b", "c"]]), ["a", "b", "c"]);
    80     deepEqual(base.flattenArray(["a"], [], ["b"]]), ["a", "b"]);
     80    deepEqual(base.flattenArray([["a"], [], ["b"]]), ["a", "b"]);
    8181});
    8282

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js

    r94485 r94486  
    4949var kActualImageSuffix = '-actual.png';
    5050var kImageDiffSuffix = '-diff.png';
    51 var kTextDiffSuffix = '-diff.txt';
     51var kExpectedTextSuffix = '-expected.txt';
     52var kActualTextSuffix = '-actual.txt';
     53var kDiffTextSuffix = '-diff.txt';
    5254var kCrashLogSuffix = '-crash-log.txt';
    5355
    … …  
    5961    kActualImageSuffix,
    6062    kImageDiffSuffix,
    61     kTextDiffSuffix,
     63    kExpectedTextSuffix,
     64    kActualTextSuffix,
     65    kDiffTextSuffix,
    6266    kCrashLogSuffix,
    6367    // FIXME: Add support for the rest of the result types.
    … …  
    108112    function pushTextSuffixes()
    109113    {
    110         // '-expected.txt',
    111         // '-actual.txt',
    112         suffixList.push(kTextDiffSuffix);
     114        suffixList.push(kActualTextSuffix);
     115        suffixList.push(kExpectedTextSuffix);
     116        suffixList.push(kDiffTextSuffix);
    113117        // '-wdiff.html',
    114118        // '-pretty-diff.html',

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js

    r94314 r94486  
    406406                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.png",
    407407                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.png",
    408                 "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt"
     408                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.txt",
     409                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.txt",
     410                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt",
    409411            ]);
    410412        });
    … …  
    419421        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.png",
    420422        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.png",
    421         "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt"
     423        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.txt",
     424        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.txt",
     425        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt",
    422426    ]);
    423427});

  • trunk/Tools/ChangeLog

    r94485 r94486  
     12011-09-03  Adam Barth  <abarth@webkit.org>
     2
     3        garden-o-matic results view should show Actual and Expected results for text failures
     4        https://bugs.webkit.org/show_bug.cgi?id=67536
     5
     6        Reviewed by Eric Seidel.
     7
     8        In the past, we didn't show actual and expected text results (we just
     9        showed the diff) because we didn't have the awesome six-by-two results
     10        grid.  Now that we do, we can move show these results.
     11
     12        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js:
     13        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js:
     14          - Fixed some typos that were preventing these unit tests from running.
     15        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js:
     16        (.):
     17        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js:
     18          - Report -actual.txt and -expected.txt as possible results URLs.
     19
    1202011-09-03  Adam Barth  <abarth@webkit.org>
    221
Note: See TracChangeset for help on using the changeset viewer.