Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (198528 => 198529)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2016-03-22 14:27:41 UTC (rev 198528)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2016-03-22 15:29:15 UTC (rev 198529)
@@ -74,11 +74,12 @@
{ "name": "gtk-linux-slave-8", "platform": "gtk" },
{ "name": "efl-linux-slave-2", "platform": "efl" },
- { "name": "efl-linux-szeged-slave-1", "platform": "efl" },
- { "name": "efl-linux-szeged-slave-2", "platform": "efl" },
- { "name": "efl-linux-szeged-slave-3", "platform": "efl" },
- { "name": "efl-linux-szeged-slave-4", "platform": "efl" }
+ { "name": "efl-linux-slave-3", "platform": "efl" },
+ { "name": "jsconly-linux-szeged-slave-1", "platform": "jsc-only" },
+ { "name": "jsconly-linux-szeged-slave-2", "platform": "jsc-only" },
+ { "name": "jsconly-linux-szeged-slave-3", "platform": "jsc-only" }
+
],
"builders": [ { "name": "Apple El Capitan Debug (Build)", "type": "Build", "builddir": "elcapitan-debug",
@@ -317,35 +318,35 @@
"slavenames": ["efl-linux-slave-2"]
},
{
- "name": "EFL Linux ARMv7 Thumb2 Release", "type": "BuildAndRemoteJSCTests", "builddir": "efl-linux-armv7-thumb2-release",
- "platform": "efl", "configuration": "release", "architectures": ["armv7"],
- "SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",
- "slavenames": ["efl-linux-szeged-slave-1"]
+ "name": "EFL Linux 64-bit Release WK2 (Perf)", "type": "BuildAndPerfTest", "builddir": "efl-linux-64-release-wk2-perf",
+ "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["efl-linux-slave-3"]
},
{
- "name": "EFL Linux ARMv7 Traditional Release", "type": "BuildAndRemoteJSCTests", "builddir": "efl-linux-armv7-traditional-release",
- "platform": "efl", "configuration": "release", "architectures": ["armv7"],
+ "name": "JSCOnly Linux AArch64 Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-aarch64-release",
+ "platform": "jsc-only", "configuration": "release", "architectures": ["aarch64"],
"SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",
- "slavenames": ["efl-linux-szeged-slave-2"]
+ "slavenames": ["jsconly-linux-szeged-slave-1"]
},
{
- "name": "EFL Linux AArch64 Release", "type": "BuildAndRemoteJSCTests", "builddir": "efl-linux-aarch64-release",
- "platform": "efl", "configuration": "release", "architectures": ["aarch64"],
+ "name": "JSCOnly Linux ARMv7 Thumb2 Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-armv7-thumb2-release",
+ "platform": "jsc-only", "configuration": "release", "architectures": ["armv7"],
"SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",
- "slavenames": ["efl-linux-szeged-slave-4"]
+ "slavenames": ["jsconly-linux-szeged-slave-2"]
},
{
- "name": "EFL Linux 64-bit Release WK2 (Perf)", "type": "BuildAndPerfTest", "builddir": "efl-linux-64-release-wk2-perf",
- "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
- "slavenames": ["efl-linux-szeged-slave-3"]
+ "name": "JSCOnly Linux ARMv7 Traditional Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-armv7-traditional-release",
+ "platform": "jsc-only", "configuration": "release", "architectures": ["armv7"],
+ "SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",
+ "slavenames": ["jsconly-linux-szeged-slave-3"]
}
],
"schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "change_filter": "trunk_filter", "treeStableTimer": 45.0,
"builderNames": ["GTK Linux 32-bit Release", "GTK Linux 64-bit Release (Build)", "GTK Linux 64-bit Debug (Build)", "GTK Linux ARM Release",
- "EFL Linux 64-bit Release WK2",
- "EFL Linux ARMv7 Thumb2 Release", "EFL Linux ARMv7 Traditional Release", "EFL Linux AArch64 Release",
- "EFL Linux 64-bit Release WK2 (Perf)", "WinCairo 64-Bit Release"]
+ "EFL Linux 64-bit Release WK2", "EFL Linux 64-bit Release WK2 (Perf)",
+ "JSCOnly Linux AArch64 Release", "JSCOnly Linux ARMv7 Thumb2 Release", "JSCOnly Linux ARMv7 Traditional Release",
+ "WinCairo 64-Bit Release"]
},
{ "type": "PlatformSpecificScheduler", "platform": "mac-yosemite", "branch": "trunk", "treeStableTimer": 45.0,
"builderNames": ["Apple Yosemite Release (Build)", "Apple Yosemite Debug (Build)", "Apple Yosemite LLINT CLoop (BuildAndTest)", "Apple Yosemite 32-bit JSC (BuildAndTest)", "Apple Yosemite Release (32-bit Build)"]
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (198528 => 198529)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2016-03-22 14:27:41 UTC (rev 198528)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2016-03-22 15:29:15 UTC (rev 198529)
@@ -97,7 +97,9 @@
descriptionDone = ["configured build"]
def __init__(self, platform, configuration, architecture, buildOnly, additionalArguments, SVNMirror, *args, **kwargs):
buildstep.BuildStep.__init__(self, *args, **kwargs)
- self.platform = platform.split('-', 1)[0]
+ self.platform = platform
+ if platform != 'jsc-only':
+ self.platform = platform.split('-', 1)[0]
self.fullPlatform = platform
self.configuration = configuration
self.architecture = architecture
@@ -189,7 +191,7 @@
haltOnFailure = True
def appendCustomBuildFlags(step, platform, fullPlatform):
- if platform not in ('efl', 'gtk', 'wincairo', 'ios'):
+ if platform not in ('efl', 'gtk', 'wincairo', 'ios', 'jsc-only'):
return
if fullPlatform.startswith('ios-simulator'):
platform = 'ios-simulator'
@@ -247,6 +249,8 @@
class Compile32bitJSC(CompileWebKit):
command = ["perl", "./Tools/Scripts/build-jsc", "--32-bit", WithProperties("--%(configuration)s")]
+class CompileJSCOnly(CompileWebKit):
+ command = ["perl", "./Tools/Scripts/build-jsc", WithProperties("--%(configuration)s")]
class ArchiveBuiltProduct(shell.ShellCommand):
command = ["python", "./Tools/BuildSlaveSupport/built-product-archive",
@@ -785,7 +789,7 @@
if SVNMirror:
self.addStep(WaitForSVNServer())
self.addStep(CheckOutSource(SVNMirror=SVNMirror))
- if not (platform == "efl" and ('armv7' in architectures or 'aarch64' in architectures)):
+ if not (platform == "jsc-only"):
self.addStep(KillOldProcesses())
self.addStep(CleanBuildIfScheduled())
self.addStep(DeleteStaleBuildFiles())
@@ -871,9 +875,10 @@
class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
LayoutTestClass = None
-class BuildAndRemoteJSCTestsFactory(BuildFactory):
+class BuildAndRemoteJSCTestsFactory(Factory):
def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None):
- BuildFactory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
+ self.addStep(CompileJSCOnly())
self.addStep(RunRemoteJavaScriptCoreTests())
class TestWebKit1LeaksFactory(Factory):
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (198528 => 198529)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2016-03-22 14:27:41 UTC (rev 198528)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2016-03-22 15:29:15 UTC (rev 198529)
@@ -410,10 +410,11 @@
'EFL Linux 64-bit Release WK2' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
'EFL Linux 64-bit Release WK2 (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'perf-test'],
- 'EFL Linux ARMv7 Thumb2 Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test'],
- 'EFL Linux ARMv7 Traditional Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test'],
- 'EFL Linux AArch64 Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test'],
+ 'JSCOnly Linux ARMv7 Thumb2 Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
+ 'JSCOnly Linux ARMv7 Traditional Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
+ 'JSCOnly Linux AArch64 Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
+
'GTK Linux 32-bit Release' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'API tests', 'WebKit GObject DOM bindings API break tests'],
'GTK Linux 64-bit Debug (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
'GTK Linux 64-bit Debug (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests', 'WebKit GObject DOM bindings API break tests'],
Modified: trunk/Tools/BuildSlaveSupport/clean-build (198528 => 198529)
--- trunk/Tools/BuildSlaveSupport/clean-build 2016-03-22 14:27:41 UTC (rev 198528)
+++ trunk/Tools/BuildSlaveSupport/clean-build 2016-03-22 15:29:15 UTC (rev 198529)
@@ -47,6 +47,8 @@
platform = 'ios-simulator'
elif options.platform.startswith('ios'):
platform = 'device'
+ elif options.platform.startswith('jsc-only'):
+ platform = 'jsc-only'
else:
platform = options.platform.split('-', 1)[0]
Modified: trunk/Tools/ChangeLog (198528 => 198529)
--- trunk/Tools/ChangeLog 2016-03-22 14:27:41 UTC (rev 198528)
+++ trunk/Tools/ChangeLog 2016-03-22 15:29:15 UTC (rev 198529)
@@ -1,3 +1,22 @@
+2016-03-22 Csaba Osztrogonác <[email protected]>
+
+ [buildbot] Move ARM Linux bots to JSCOnly port
+ https://bugs.webkit.org/show_bug.cgi?id=155655
+
+ Reviewed by Lucas Forschler.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (ConfigureBuild.__init__):
+ (appendCustomBuildFlags):
+ (CompileJSCOnly):
+ (Factory.__init__):
+ (BuildAndRemoteJSCTestsFactory):
+ (BuildAndRemoteJSCTestsFactory.__init__):
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ * BuildSlaveSupport/clean-build:
+ (main):
+
2016-03-21 Brent Fulgham <[email protected]>
Improve SharedBuffer testing
