[WK2][GTK] Split the 64-bit GTK buildbots in Build and Test.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 May 2014 16:08:43 +0000 (16:08 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 May 2014 16:08:43 +0000 (16:08 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168471 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/BuildSlaveSupport/build.webkit.org-config/config.json
Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
Tools/ChangeLog
Tools/Scripts/webkitpy/port/builders.py
Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
Tools/TestResultServer/static-dashboards/builders.jsonp
Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js
Tools/TestResultServer/static-dashboards/loader_unittests.js

index 6149cae..448ec40 100644 (file)
@@ -37,6 +37,8 @@
                     { "name": "gtk-linux-slave-2", "platform": "gtk"},
                     { "name": "gtk-linux-slave-3", "platform": "gtk"},
                     { "name": "gtk-linux-slave-5", "platform": "gtk"},
+                    { "name": "gtk-linux-slave-6", "platform": "gtk"},
+                    { "name": "gtk-linux-slave-7", "platform": "gtk"},
 
                     { "name": "wincairo-1", "platform": "wincairo" },
 
                       "slavenames": ["gtk-linux-slave-1"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release", "type": "BuildAndTestWebKit2Only", "builddir": "gtk-linux-64-release",
+                      "name": "GTK Linux 64-bit Release (Build)", "type": "Build", "builddir": "gtk-linux-64-release",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
+                      "triggers": ["gtk-linux-64-release-tests"],
                       "slavenames": ["gtk-linux-slave-2"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Debug", "type": "BuildAndTestWebKit2Only", "builddir": "gtk-linux-64-debug",
+                      "name": "GTK Linux 64-bit Release (Tests)", "type": "TestWebKit2", "builddir": "gtk-linux-64-release",
+                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
+                      "slavenames": ["gtk-linux-slave-6"]
+                    },
+                    {
+                      "name": "GTK Linux 64-bit Debug (Build)", "type": "Build", "builddir": "gtk-linux-64-debug",
                       "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
+                      "triggers": ["gtk-linux-64-debug-tests"],
                       "slavenames": ["gtk-linux-slave-3"]
                     },
                     {
+                      "name": "GTK Linux 64-bit Debug (Tests)", "type": "TestWebKit2", "builddir": "gtk-linux-64-debug",
+                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
+                      "slavenames": ["gtk-linux-slave-7"]
+                    },
+                    {
                       "name": "GTK Linux ARM Release", "type": "BuildAndNonLayoutTest", "builddir": "gtk-linux-arm-release",
                       "platform": "gtk", "configuration": "release", "architectures": ["armv7"],
                       "slavenames": ["gtk-linux-slave-5"]
                     },
                     { "type": "Triggerable", "name": "win-debug-tests",
                       "builderNames": ["Apple Win 7 Debug (Tests)"]
+                    },
+                    { "type": "Triggerable", "name": "gtk-linux-64-release-tests",
+                      "builderNames": ["GTK Linux 64-bit Release (Tests)"]
+                    },
+                    { "type": "Triggerable", "name": "gtk-linux-64-debug-tests",
+                      "builderNames": ["GTK Linux 64-bit Debug (Tests)"]
                     }
                   ]
 }
index 32a8b94..0f58d3d 100644 (file)
@@ -847,6 +847,7 @@ class TestFactory(Factory):
             self.addStep(RunEflAPITests)
         if platform == "gtk":
             self.addStep(RunGtkAPITests())
+            self.addStep(RunGtkWebKitGObjectDOMBindingsAPIBreakTests())
 
 class BuildAndTestFactory(Factory):
     CompileClass = CompileWebKit
index 14cf7c3..242772b 100644 (file)
@@ -67,8 +67,8 @@ config.kPlatforms = {
         waterfallURL: 'http://build.webkit.org/waterfall',
         builders: {
             'GTK Linux 32-bit Release' : {version: '32-bit release'},
-            'GTK Linux 64-bit Release' : {version: '64-bit release'},
-            'GTK Linux 64-bit Debug' : {version: '64-bit debug', debug: true},
+            'GTK Linux 64-bit Release (Tests)' : {version: '64-bit release'},
+            'GTK Linux 64-bit Debug (Tests)' : {version: '64-bit debug', debug: true},
         },
         haveBuilderAccumulatedResults : false,
         useDirectoryListingForOldBuilds: false,
index c9e780e..d33ae71 100644 (file)
@@ -43,7 +43,10 @@ WebKitBuildbot = function()
         "Apple Win Release (Build)": {platform: Dashboard.Platform.Windows7, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
         "Apple Win 7 Debug (Tests)": {platform: Dashboard.Platform.Windows7, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
         "Apple Win 7 Release (Tests)": {platform: Dashboard.Platform.Windows7, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
-        "GTK Linux 64-bit Release": {platform: Dashboard.Platform.LinuxGTK, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "GTK Linux 64-bit Release (Build)": {platform: Dashboard.Platform.LinuxGTK, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "GTK Linux 64-bit Release (Tests)": {platform: Dashboard.Platform.LinuxGTK, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "GTK Linux 64-bit Debug (Build)": {platform: Dashboard.Platform.LinuxGTK, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "GTK Linux 64-bit Debug (Tests)": {platform: Dashboard.Platform.LinuxGTK, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
         "EFL Linux 32-bit Release (Build)": {platform: Dashboard.Platform.LinuxEFL, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
         "EFL Linux 64-bit Release WK1": {platform: Dashboard.Platform.LinuxEFL, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
         "EFL Linux 64-bit Release WK2": {platform: Dashboard.Platform.LinuxEFL, tester: true, testCategory: Buildbot.TestCategory.WebKit2}
index 536a6bb..55d7a51 100644 (file)
@@ -1,3 +1,31 @@
+2014-05-08  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [WK2][GTK] Split the 64-bit GTK buildbots in Build and Test.
+        https://bugs.webkit.org/show_bug.cgi?id=131358
+
+        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:
+
 2014-05-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [CoordinatedGraphics][WK2] Scale factor and scroll position is not being restored properly in a back/forward load
index b5f642a..e82b1f9 100644 (file)
@@ -68,8 +68,8 @@ _exact_matches = {
     "Apple Win 7 Release (Tests)": {"port_name": "win-7sp0", "is_debug": False, "rebaseline_override_dir": "win"},
 
     "GTK Linux 32-bit Release": {"port_name": "gtk-wk2", "is_debug": False},
-    "GTK Linux 64-bit Debug": {"port_name": "gtk-wk2", "is_debug": True},
-    "GTK Linux 64-bit Release": {"port_name": "gtk-wk2", "is_debug": False},
+    "GTK Linux 64-bit Debug (Tests)": {"port_name": "gtk-wk2", "is_debug": True},
+    "GTK Linux 64-bit Release (Tests)": {"port_name": "gtk-wk2", "is_debug": False},
 
     "EFL Linux 64-bit Release": {"port_name": "efl", "is_debug": False},
     "EFL Linux 64-bit Release WK2": {"port_name": "efl-wk2", "is_debug": False},
index b64f7f0..9efd713 100644 (file)
@@ -91,8 +91,8 @@ class TestRebaselineTest(_BaseTestCase):
         self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
         self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
         self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
-        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
-        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
+        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
+        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
         self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl-wk2")
 
     def test_rebaseline_updates_expectations_file_noop(self):
index f59ca79..9abe517 100644 (file)
@@ -21,8 +21,8 @@ LOAD_BUILDBOT_DATA([
                     "EFL Linux 64-bit Release", 
                     "EFL Linux 64-bit Release WK2", 
                     "GTK Linux 32-bit Release",
-                    "GTK Linux 64-bit Debug",
-                    "GTK Linux 64-bit Release",
+                    "GTK Linux 64-bit Debug (Tests)",
+                    "GTK Linux 64-bit Release (Tests)",
                     "WinCairo Release"
                 ]
             }
index 4a2fa93..fa5d780 100644 (file)
@@ -46,7 +46,7 @@ function resetGlobals()
     LOAD_BUILDBOT_DATA([{
         name: 'webkit.org',
         url: 'dummyurl',
-        tests: {'layout-tests': {'builders': ['Apple Lion Release WK2 (Tests)', 'Apple Lion Debug WK2 (Tests)', 'GTK Linux 64-bit Release']}}
+        tests: {'layout-tests': {'builders': ['Apple Lion Release WK2 (Tests)', 'Apple Lion Debug WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)']}}
     }]);
  
     for (var group in LAYOUT_TESTS_BUILDER_GROUPS)
@@ -157,9 +157,8 @@ test('platformAndBuildType', 30, function() {
     runPlatformAndBuildTypeTest('MountainLion Leaks', 'APPLE_MAC_MOUNTAINLION_WK1', 'RELEASE');
     runPlatformAndBuildTypeTest('MountainLion Debug (Tests)', 'APPLE_MAC_MOUNTAINLION_WK1', 'DEBUG');
     runPlatformAndBuildTypeTest('GTK Linux 32-bit Release', 'GTK_LINUX_WK1', 'RELEASE');
-    runPlatformAndBuildTypeTest('GTK Linux 32-bit Debug', 'GTK_LINUX_WK1', 'DEBUG');
-    runPlatformAndBuildTypeTest('GTK Linux 64-bit Debug', 'GTK_LINUX_WK1', 'DEBUG');
-    runPlatformAndBuildTypeTest('GTK Linux 64-bit Debug WK2', 'GTK_LINUX_WK2', 'DEBUG');
+    runPlatformAndBuildTypeTest('GTK Linux 64-bit Release (Tests)', 'GTK_LINUX_WK2', 'RELEASE');
+    runPlatformAndBuildTypeTest('GTK Linux 64-bit Debug (Tests)', 'GTK_LINUX_WK2', 'DEBUG');
     runPlatformAndBuildTypeTest('Windows 7 Release (Tests)', 'APPLE_WIN_WIN7', 'RELEASE');
     runPlatformAndBuildTypeTest('Windows XP Debug (Tests)', 'APPLE_WIN_XP', 'DEBUG');
     
@@ -380,7 +379,7 @@ test('htmlForIndividualTestOnAllBuildersWithResultsLinks', 1, function() {
         '</table>' +
         '<div>The following builders either don\'t run this test (e.g. it\'s skipped) or all runs passed:</div>' +
         '<div class=skipped-builder-list>' +
-            '<div class=skipped-builder>Apple Lion Debug WK2 (Tests)</div><div class=skipped-builder>GTK Linux 64-bit Release</div>' +
+            '<div class=skipped-builder>Apple Lion Debug WK2 (Tests)</div><div class=skipped-builder>GTK Linux 64-bit Release (Tests)</div>' +
         '</div>' +
         '<div class=expectations test=dummytest.html>' +
             '<div><span class=link onclick="g_history.setQueryParameter(\'showExpectations\', true)">Show results</span> | ' +
index 400b28c..885dc3f 100644 (file)
@@ -52,7 +52,7 @@ test('loading steps', 1, function() {
 // and then 2 per builder (one for ok, one for deepEqual of tests).
 test('results files loading', 9, function() {
     resetGlobals();
-    var expectedLoadedBuilders =  ['Apple Lion Debug WK2 (Tests)', 'Apple Lion Release WK2 (Tests)', 'GTK Linux 64-bit Release'];
+    var expectedLoadedBuilders =  ['Apple Lion Debug WK2 (Tests)', 'Apple Lion Release WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)'];
     var loadedBuilders = [];
     var resourceLoader = new loader.Loader();
     resourceLoader._loadNext = function() {