Changeset 168471 in webkit


Ignore:
Timestamp:
May 8, 2014 9:08:43 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[WK2][GTK] Split the 64-bit GTK buildbots in Build and Test.
​https://bugs.webkit.org/show_bug.cgi?id=131358

Patch by Carlos Alberto Lopez Perez <​clopez@igalia.com> on 2014-05-08
Reviewed by Carlos Garcia Campos.

Current 64-bit GTK build bots (Release and Debug) not only test
the build, but run all tests. Split each one of the bots in
BuildOnly and TestWebKit2.

This will allow us to have a better overview of the status of
the GTK port.

Original patch from Sergio Villar Senin <​svillar@igalia.com>

  • BuildSlaveSupport/build.webkit.org-config/config.json:
  • BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js:
  • BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:

(WebKitBuildbot):

  • Scripts/webkitpy/port/builders.py:
  • Scripts/webkitpy/tool/commands/rebaseline_unittest.py:

(TestRebaselineTest.test_baseline_directory):

  • TestResultServer/static-dashboards/builders.jsonp:
  • TestResultServer/static-dashboards/flakiness_dashboard_unittests.js:

(resetGlobals):

  • TestResultServer/static-dashboards/loader_unittests.js:
Location:
trunk/Tools
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

    r166729 r168471  
    3838                    { "name": "gtk-linux-slave-3", "platform": "gtk"},
    3939                    { "name": "gtk-linux-slave-5", "platform": "gtk"},
     40                    { "name": "gtk-linux-slave-6", "platform": "gtk"},
     41                    { "name": "gtk-linux-slave-7", "platform": "gtk"},
    4042
    4143                    { "name": "wincairo-1", "platform": "wincairo" },
    … …  
    158160                    },
    159161                    {
    160                       "name": "GTK Linux 64-bit Release", "type": "BuildAndTestWebKit2Only", "builddir": "gtk-linux-64-release",
     162                      "name": "GTK Linux 64-bit Release (Build)", "type": "Build", "builddir": "gtk-linux-64-release",
    161163                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
     164                      "triggers": ["gtk-linux-64-release-tests"],
    162165                      "slavenames": ["gtk-linux-slave-2"]
    163166                    },
    164167                    {
    165                       "name": "GTK Linux 64-bit Debug", "type": "BuildAndTestWebKit2Only", "builddir": "gtk-linux-64-debug",
     168                      "name": "GTK Linux 64-bit Release (Tests)", "type": "TestWebKit2", "builddir": "gtk-linux-64-release",
     169                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
     170                      "slavenames": ["gtk-linux-slave-6"]
     171                    },
     172                    {
     173                      "name": "GTK Linux 64-bit Debug (Build)", "type": "Build", "builddir": "gtk-linux-64-debug",
    166174                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
     175                      "triggers": ["gtk-linux-64-debug-tests"],
    167176                      "slavenames": ["gtk-linux-slave-3"]
     177                    },
     178                    {
     179                      "name": "GTK Linux 64-bit Debug (Tests)", "type": "TestWebKit2", "builddir": "gtk-linux-64-debug",
     180                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
     181                      "slavenames": ["gtk-linux-slave-7"]
    168182                    },
    169183                    {
    … …  
    265279                    { "type": "Triggerable", "name": "win-debug-tests",
    266280                      "builderNames": ["Apple Win 7 Debug (Tests)"]
     281                    },
     282                    { "type": "Triggerable", "name": "gtk-linux-64-release-tests",
     283                      "builderNames": ["GTK Linux 64-bit Release (Tests)"]
     284                    },
     285                    { "type": "Triggerable", "name": "gtk-linux-64-debug-tests",
     286                      "builderNames": ["GTK Linux 64-bit Debug (Tests)"]
    267287                    }
    268288                  ]

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

    r166608 r168471  
    848848        if platform == "gtk":
    849849            self.addStep(RunGtkAPITests())
     850            self.addStep(RunGtkWebKitGObjectDOMBindingsAPIBreakTests())
    850851
    851852class BuildAndTestFactory(Factory):

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

    r148075 r168471  
    6868        builders: {
    6969            'GTK Linux 32-bit Release' : {version: '32-bit release'},
    70             'GTK Linux 64-bit Release' : {version: '64-bit release'},
    71             'GTK Linux 64-bit Debug' : {version: '64-bit debug', debug: true},
     70            'GTK Linux 64-bit Release (Tests)' : {version: '64-bit release'},
     71            'GTK Linux 64-bit Debug (Tests)' : {version: '64-bit debug', debug: true},
    7272        },
    7373        haveBuilderAccumulatedResults : false,

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js

    r167301 r168471  
    4444        "Apple Win 7 Debug (Tests)": {platform: Dashboard.Platform.Windows7, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
    4545        "Apple Win 7 Release (Tests)": {platform: Dashboard.Platform.Windows7, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
    46         "GTK Linux 64-bit Release": {platform: Dashboard.Platform.LinuxGTK, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
     46        "GTK Linux 64-bit Release (Build)": {platform: Dashboard.Platform.LinuxGTK, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
     47        "GTK Linux 64-bit Release (Tests)": {platform: Dashboard.Platform.LinuxGTK, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
     48        "GTK Linux 64-bit Debug (Build)": {platform: Dashboard.Platform.LinuxGTK, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
     49        "GTK Linux 64-bit Debug (Tests)": {platform: Dashboard.Platform.LinuxGTK, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
    4750        "EFL Linux 32-bit Release (Build)": {platform: Dashboard.Platform.LinuxEFL, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
    4851        "EFL Linux 64-bit Release WK1": {platform: Dashboard.Platform.LinuxEFL, tester: true, testCategory: Buildbot.TestCategory.WebKit1},

  • trunk/Tools/ChangeLog

    r168458 r168471  
     12014-05-08  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [WK2][GTK] Split the 64-bit GTK buildbots in Build and Test.
     4        https://bugs.webkit.org/show_bug.cgi?id=131358
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Current 64-bit GTK build bots (Release and Debug) not only test
     9        the build, but run all tests. Split each one of the bots in
     10        BuildOnly and TestWebKit2.
     11
     12        This will allow us to have a better overview of the status of
     13        the GTK port.
     14
     15        Original patch from Sergio Villar Senin <svillar@igalia.com>
     16
     17        * BuildSlaveSupport/build.webkit.org-config/config.json:
     18        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js:
     19        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
     20        (WebKitBuildbot):
     21        * Scripts/webkitpy/port/builders.py:
     22        * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
     23        (TestRebaselineTest.test_baseline_directory):
     24        * TestResultServer/static-dashboards/builders.jsonp:
     25        * TestResultServer/static-dashboards/flakiness_dashboard_unittests.js:
     26        (resetGlobals):
     27        * TestResultServer/static-dashboards/loader_unittests.js:
     28
    1292014-05-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    230

  • trunk/Tools/Scripts/webkitpy/port/builders.py

    r166427 r168471  
    6969
    7070    "GTK Linux 32-bit Release": {"port_name": "gtk-wk2", "is_debug": False},
    71     "GTK Linux 64-bit Debug": {"port_name": "gtk-wk2", "is_debug": True},
    72     "GTK Linux 64-bit Release": {"port_name": "gtk-wk2", "is_debug": False},
     71    "GTK Linux 64-bit Debug (Tests)": {"port_name": "gtk-wk2", "is_debug": True},
     72    "GTK Linux 64-bit Release (Tests)": {"port_name": "gtk-wk2", "is_debug": False},
    7373
    7474    "EFL Linux 64-bit Release": {"port_name": "efl", "is_debug": False},

  • trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

    r166427 r168471  
    9292        self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
    9393        self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
    94         self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
    95         self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
     94        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
     95        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
    9696        self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl-wk2")
    9797

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

    r166427 r168471  
    2222                    "EFL Linux 64-bit Release WK2",
    2323                    "GTK Linux 32-bit Release",
    24                     "GTK Linux 64-bit Debug",
    25                     "GTK Linux 64-bit Release",
     24                    "GTK Linux 64-bit Debug (Tests)",
     25                    "GTK Linux 64-bit Release (Tests)",
    2626                    "WinCairo Release"
    2727                ]

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

    r158669 r168471  
    4747        name: 'webkit.org',
    4848        url: 'dummyurl',
    49         tests: {'layout-tests': {'builders': ['Apple Lion Release WK2 (Tests)', 'Apple Lion Debug WK2 (Tests)', 'GTK Linux 64-bit Release']}}
     49        tests: {'layout-tests': {'builders': ['Apple Lion Release WK2 (Tests)', 'Apple Lion Debug WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)']}}
    5050    }]);
    5151 
    … …  
    158158    runPlatformAndBuildTypeTest('MountainLion Debug (Tests)', 'APPLE_MAC_MOUNTAINLION_WK1', 'DEBUG');
    159159    runPlatformAndBuildTypeTest('GTK Linux 32-bit Release', 'GTK_LINUX_WK1', 'RELEASE');
    160     runPlatformAndBuildTypeTest('GTK Linux 32-bit Debug', 'GTK_LINUX_WK1', 'DEBUG');
    161     runPlatformAndBuildTypeTest('GTK Linux 64-bit Debug', 'GTK_LINUX_WK1', 'DEBUG');
    162     runPlatformAndBuildTypeTest('GTK Linux 64-bit Debug WK2', 'GTK_LINUX_WK2', 'DEBUG');
     160    runPlatformAndBuildTypeTest('GTK Linux 64-bit Release (Tests)', 'GTK_LINUX_WK2', 'RELEASE');
     161    runPlatformAndBuildTypeTest('GTK Linux 64-bit Debug (Tests)', 'GTK_LINUX_WK2', 'DEBUG');
    163162    runPlatformAndBuildTypeTest('Windows 7 Release (Tests)', 'APPLE_WIN_WIN7', 'RELEASE');
    164163    runPlatformAndBuildTypeTest('Windows XP Debug (Tests)', 'APPLE_WIN_XP', 'DEBUG');
    … …  
    381380        '<div>The following builders either don\'t run this test (e.g. it\'s skipped) or all runs passed:</div>' +
    382381        '<div class=skipped-builder-list>' +
    383             '<div class=skipped-builder>Apple Lion Debug WK2 (Tests)</div><div class=skipped-builder>GTK Linux 64-bit Release</div>' +
     382            '<div class=skipped-builder>Apple Lion Debug WK2 (Tests)</div><div class=skipped-builder>GTK Linux 64-bit Release (Tests)</div>' +
    384383        '</div>' +
    385384        '<div class=expectations test=dummytest.html>' +

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

    r156866 r168471  
    5353test('results files loading', 9, function() {
    5454    resetGlobals();
    55     var expectedLoadedBuilders =  ['Apple Lion Debug WK2 (Tests)', 'Apple Lion Release WK2 (Tests)', 'GTK Linux 64-bit Release'];
     55    var expectedLoadedBuilders =  ['Apple Lion Debug WK2 (Tests)', 'Apple Lion Release WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)'];
    5656    var loadedBuilders = [];
    5757    var resourceLoader = new loader.Loader();
Note: See TracChangeset for help on using the changeset viewer.