Changeset 128077 in webkit


Ignore:
Timestamp:
Sep 10, 2012 10:26:58 AM (12 years ago)
Author:
ojan@chromium.org
Message:

Make EFL bots work on the flakiness dashboard
​https://bugs.webkit.org/show_bug.cgi?id=96164

Reviewed by Tony Chang.

Also, update outdated unittests that had started failing.

  • TestResultServer/static-dashboards/builders.js:

(isWebkitTestRunner):

  • TestResultServer/static-dashboards/flakiness_dashboard.js:

(nonChromiumPlatform):

  • TestResultServer/static-dashboards/flakiness_dashboard_unittests.js:

(test):

Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r128064 r128077  
     12012-09-10  Ojan Vafai  <ojan@chromium.org>
     2
     3        Make EFL bots work on the flakiness dashboard
     4        https://bugs.webkit.org/show_bug.cgi?id=96164
     5
     6        Reviewed by Tony Chang.
     7
     8        Also, update outdated unittests that had started failing.
     9
     10        * TestResultServer/static-dashboards/builders.js:
     11        (isWebkitTestRunner):
     12        * TestResultServer/static-dashboards/flakiness_dashboard.js:
     13        (nonChromiumPlatform):
     14        * TestResultServer/static-dashboards/flakiness_dashboard_unittests.js:
     15        (test):
     16
    1172012-09-10  Tommy Widenflycht  <tommyw@google.com>
    218

  • trunk/Tools/TestResultServer/static-dashboards/builders.js

    r127482 r128077  
    164164function isWebkitTestRunner(builder)
    165165{
     166    if (builder.indexOf('EFL') != -1)
     167        return builder.indexOf('Build') == -1;
    166168    if (builder.indexOf('Tests') != -1) {
    167169        // Apple Windows bots still run old-run-webkit-tests, so they don't upload data.

  • trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js

    r121696 r128077  
    4141// FIXME: These platform names should probably be changed to match the directories in LayoutTests/platform
    4242// instead of matching the values we use in the TestExpectations file.
    43 var PLATFORMS = ['LION', 'SNOWLEOPARD', 'XP', 'VISTA', 'WIN7', 'LUCID', 'APPLE_LION', 'APPLE_SNOWLEOPARD', 'APPLE_XP', 'APPLE_WIN7', 'GTK_LINUX', 'QT_LINUX'];
     43var PLATFORMS = ['LION', 'SNOWLEOPARD', 'XP', 'VISTA', 'WIN7', 'LUCID', 'APPLE_LION', 'APPLE_SNOWLEOPARD', 'APPLE_XP', 'APPLE_WIN7', 'GTK_LINUX', 'QT_LINUX', 'EFL'];
    4444var PLATFORM_UNIONS = {
    4545    'MAC': ['SNOWLEOPARD', 'LION'],
    … …  
    266266    if (stringContains(builderNameUpperCase, 'QT LINUX'))
    267267        return 'QT_LINUX';
     268    if (stringContains(builderNameUpperCase, 'EFL'))
     269        return 'EFL';
    268270}
    269271

  • trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js

    r125926 r128077  
    191191});
    192192
    193 test('allTestsWithSamePlatformAndBuildType', 12, function() {
     193test('allTestsWithSamePlatformAndBuildType', 13, function() {
    194194    // FIXME: test that allTestsWithSamePlatformAndBuildType actually returns the right set of tests.
    195195    for (var i = 0; i < PLATFORMS.length; i++)
    … …  
    311311    var container = document.createElement('div');
    312312    g_crossDashboardState.testType = 'ui_tests';
    313     container.innerHTML = htmlForTestTypeSwitcher();
     313    container.innerHTML = htmlForTestTypeSwitcher(true);
    314314    var selects = container.querySelectorAll('select');
    315     equal(selects.length, 3);
    316     var group = selects[2];
     315    equal(selects.length, 2);
     316    var group = selects[1];
    317317    equal(group.parentNode.textContent.indexOf('Group:'), 0);
    318318    equal(group.children.length, 3);
    319319
    320320    g_crossDashboardState.testType = 'layout-tests';
    321     container.innerHTML = htmlForTestTypeSwitcher();
     321    container.innerHTML = htmlForTestTypeSwitcher(true);
    322322    var selects = container.querySelectorAll('select');
    323     equal(selects.length, 3);
    324     var group = selects[2];
     323    equal(selects.length, 2);
     324    var group = selects[1];
    325325    equal(group.parentNode.textContent.indexOf('Group:'), 0);
    326     equal(group.children.length, 3);
     326    equal(group.children.length, 4);
    327327});
    328328
    … …  
    349349    var test = 'dummytest.html';
    350350    var builderName = 'dummyBuilder';
     351    BUILDER_TO_MASTER[builderName] = CHROMIUM_BUILDER_MASTER;
    351352    g_testToResultsMap[test] = [createResultsObjectForTest(test, builderName)];
    352353
    … …  
    362363            '<tbody></tbody>' +
    363364        '</table>' +
    364         '<div>The following builders either don\'t run this test (e.g. it\'s skipped) or all runs passed:</div>' +
    365         '<div class=skipped-builder-list>' +
    366             '<div class=skipped-builder>Webkit Linux</div>' +
    367             '<div class=skipped-builder>Webkit Linux (dbg)</div>' +
    368             '<div class=skipped-builder>Webkit Mac10.7</div>' +
    369             '<div class=skipped-builder>Webkit Win</div>' +
    370         '</div>' +
    371365        '<div class=expectations test=dummytest.html>' +
    372366            '<div><span class=link onclick="setQueryParameter(\'showExpectations\', true)">Show results</span> | ' +
    … …  
    394388            '<tbody></tbody>' +
    395389        '</table>' +
    396         '<div>The following builders either don\'t run this test (e.g. it\'s skipped) or all runs passed:</div>' +
    397         '<div class=skipped-builder-list>' +
    398             '<div class=skipped-builder>Webkit Linux</div>' +
    399             '<div class=skipped-builder>Webkit Linux (dbg)</div>' +
    400             '<div class=skipped-builder>Webkit Mac10.7</div>' +
    401             '<div class=skipped-builder>Webkit Win</div>' +
    402         '</div>' +
    403390        '<div class=expectations test=dummytest.html>' +
    404391            '<div><span class=link onclick="setQueryParameter(\'showExpectations\', true)">Show results</span> | ' +
    … …  
    512499        "Qt SnowLeopard Release", "Qt Windows 32-bit Debug", "Qt Windows 32-bit Release", "SnowLeopard Intel Debug (Build)", "SnowLeopard Intel Debug (Tests)",
    513500        "SnowLeopard Intel Debug (WebKit2 Tests)", "SnowLeopard Intel Release (Build)", "SnowLeopard Intel Release (Tests)", "SnowLeopard Intel Release (WebKit2 Tests)",
    514         "WinCE Release (Build)", "WinCairo Release", "Windows 7 Release (Tests)", "Windows 7 Release (WebKit2 Tests)", "Windows Debug (Build)", "Windows Release (Build)", "Windows XP Debug (Tests)"];
    515     var expectedBuilders = [["Chromium Linux Release (Tests)", 2], ["Chromium Mac Release (Tests)"], ["Chromium Win Release (Tests)"], ["GTK Linux 32-bit Release"], ["GTK Linux 64-bit Debug"],
     501        "WinCE Release (Build)", "WinCairo Release", "Windows 7 Release (Tests)", "Windows 7 Release (WebKit2 Tests)", "Windows Debug (Build)", "Windows Release (Build)", "Windows XP Debug (Tests)",
     502        "EFL Linux 32-bit Release (Build)", "EFL Linux 64-bit Debug"];
     503    var expectedBuilders = [["Chromium Linux Release (Tests)", 2], ["Chromium Mac Release (Tests)"], ["EFL Linux Release"], ["GTK Linux 32-bit Release"], ["GTK Linux 64-bit Debug"],
    516504        ["GTK Linux 64-bit Release"], ["Lion Debug (Tests)"], ["Lion Debug (WebKit2 Tests)"], ["Lion Release (Tests)"], ["Lion Release (WebKit2 Tests)"], ["Qt Linux Release"],
    517         ["SnowLeopard Intel Debug (Tests)"], ["SnowLeopard Intel Debug (WebKit2 Tests)"], ["SnowLeopard Intel Release (Tests)"], ["SnowLeopard Intel Release (WebKit2 Tests)"]];
     505        ["SnowLeopard Intel Debug (Tests)"], ["SnowLeopard Intel Debug (WebKit2 Tests)"], ["SnowLeopard Intel Release (Tests)"], ["SnowLeopard Intel Release (WebKit2 Tests)"], ["EFL Linux 64-bit Debug"]];
    518506    deepEqual(generateBuildersFromBuilderList(builderList, isWebkitTestRunner), expectedBuilders);
    519507});
    … …  
    527515        "Linux (Content Shell)"];
    528516    var expectedBuilders = [["Webkit Linux", 2], ["Webkit Linux (dbg)"], ["Webkit Linux 32"], ["Webkit Mac10.6"],
    529         ["Webkit Mac10.6 (dbg)"], ["Webkit Mac10.7"], ["Webkit Win"], ["Webkit Win (dbg)(1)"], ["Webkit Win (dbg)(2)"], ["Webkit Win7"], ["Linux (Content Shell)"]];
     517        ["Webkit Mac10.6 (dbg)"], ["Webkit Mac10.7"], ["Webkit Win"], ["Webkit Win (dbg)(1)"], ["Webkit Win (dbg)(2)"], ["Webkit Win7"]];
    530518    deepEqual(generateBuildersFromBuilderList(builderList, isChromiumWebkitTipOfTreeTestRunner), expectedBuilders);
    531519});
    … …  
    630618
    631619    var testJSONData = "{ \"Dummy Builder 1\": null, \"Dummy Builder 2\": null }";
    632     onBuilderListLoad(testBuilderGroups,  function() { return true; }, dummyMaster, '@ToT - dummy.org', BuilderGroup.TOT_WEBKIT, JSON.parse(testJSONData));
     620    onBuilderListLoad(testBuilderGroups, function() { return true; }, dummyMaster, '@ToT - dummy.org', JSON.parse(testJSONData));
    633621    equal(testBuilderGroups['@ToT - dummy.org'].isToTWebKit, true);
    634     onBuilderListLoad(testBuilderGroups,  function() { return true; }, dummyMaster, '@DEPS - dummy.org', BuilderGroup.DEPS_WEBKIT, JSON.parse(testJSONData));
     622    onBuilderListLoad(testBuilderGroups, function() { return true; }, dummyMaster, '@DEPS - dummy.org', JSON.parse(testJSONData));
    635623    equal(testBuilderGroups['@DEPS - dummy.org'].isToTWebKit, false);
    636624});
    … …  
    645633    var testJSONData = "{ \"Dummy Builder 1\": null }";
    646634    equal(testBuilderGroups['@ToT - dummy.org'].expectedGroups, 3);
    647     onBuilderListLoad(testBuilderGroups,  function() { return true; }, dummyMaster, '@ToT - dummy.org', BuilderGroup.TOT_WEBKIT, JSON.parse(testJSONData));
     635    onBuilderListLoad(testBuilderGroups,  function() { return true; }, dummyMaster, '@ToT - dummy.org', JSON.parse(testJSONData));
    648636    equal(testBuilderGroups['@ToT - dummy.org'].groups, 1);
    649637    var testJSONData = "{ \"Dummy Builder 2\": null }";
    650     onBuilderListLoad(testBuilderGroups,  function() { return true; }, dummyMaster, '@ToT - dummy.org', BuilderGroup.TOT_WEBKIT, JSON.parse(testJSONData));
     638    onBuilderListLoad(testBuilderGroups,  function() { return true; }, dummyMaster, '@ToT - dummy.org', JSON.parse(testJSONData));
    651639    equal(testBuilderGroups['@ToT - dummy.org'].groups, 2);
    652640    onErrorLoadingBuilderList('http://build.dummy.org', testBuilderGroups,  '@ToT - dummy.org');
    … …  
    663651        var master = { builderJsonPath: function() {} };
    664652        var groupName = '@ToT - dummy.org';
    665         var groupEnum = null;
    666653        var builderGroup = { expectedGroups: 0 };
    667         requestBuilderList(testBuilderGroups, builderFilter, master, groupName, groupEnum, builderGroup);
     654        requestBuilderList(testBuilderGroups, builderFilter, master, groupName, builderGroup);
    668655
    669656        equal(testBuilderGroups['@ToT - dummy.org'], builderGroup);
Note: See TracChangeset for help on using the changeset viewer.