diff options
Diffstat (limited to 'WebKitTools/BuildSlaveSupport')
3 files changed, 31 insertions, 11 deletions
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json index db7379d..81e3f91 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -38,6 +38,9 @@ { "name": "google-windows-1", "platform": "chromium" }, { "name": "google-mac-1", "platform": "chromium" }, { "name": "google-linux-1", "platform": "chromium" }, + { "name": "google-windows-2", "platform": "chromium" }, + { "name": "google-mac-2", "platform": "chromium" }, + { "name": "google-linux-2", "platform": "chromium" }, { "name": "google-new-tests", "platform": "mac-leopard" } ], @@ -165,11 +168,26 @@ "platform": "chromium", "configuration": "release", "architectures": ["i386"], "slavenames": ["google-linux-1"] }, - { - "name": "New run-webkit-tests", "type": "NewBuildAndTest", "builddir": "google-new-tests", - "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"], - "slavenames": ["google-new-tests"] - } + { + "name": "Chromium Win Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-win-release-tests", + "platform": "chromium", "configuration": "release", "architectures": ["i386"], + "slavenames": ["google-windows-2"] + }, + { + "name": "Chromium Mac Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-mac-release-tests", + "platform": "chromium", "configuration": "release", "architectures": ["i386"], + "slavenames": ["google-mac-2"] + }, + { + "name": "Chromium Linux Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-linux-release-tests", + "platform": "chromium", "configuration": "release", "architectures": ["i386"], + "slavenames": ["google-linux-2"] + }, + { + "name": "New run-webkit-tests", "type": "NewBuildAndTest", "builddir": "google-new-tests", + "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"], + "slavenames": ["google-new-tests"] + } ], "schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "branches": ["trunk"], "treeStableTimer": 45.0, @@ -179,7 +197,8 @@ "GTK Linux 32-bit Release", "GTK Linux 32-bit Debug", "GTK Linux 64-bit Debug", "GTK Linux 64-bit Release", "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux ARMv5 Release", "Qt Linux ARMv7 Release", "Qt Windows 32-bit Release", "Qt Windows 32-bit Debug", - "Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release"] + "Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release", + "Chromium Win Release (Tests)", "Chromium Mac Release (Tests)", "Chromium Linux Release (Tests)"] }, { "type": "Triggerable", "name": "leopard-intel-release-tests", "builderNames": ["Leopard Intel Release (Tests)"] diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg index 151225f..bbc94ec 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -238,9 +238,9 @@ class RunWebKitTests(shell.Test): class NewRunWebKitTests(RunWebKitTests): - command = ["./WebKitTools/Scripts/new-run-webkit-tests", "--noshow-results", + command = ["perl", "./WebKitTools/Scripts/new-run-webkit-tests", "--noshow-results", "--verbose", "--results-directory", "layout-test-results", - WithProperties("--%(configuration)s")] + WithProperties("--%(configuration)s"), "--use-drt"] class RunPythonTests(shell.Test): @@ -376,7 +376,8 @@ class BuildAndTestFactory(Factory): def __init__(self, platform, configuration, architectures): Factory.__init__(self, platform, configuration, architectures, False) self.addStep(CompileWebKit) - self.addStep(RunJavaScriptCoreTests) + if platform != "chromium": + self.addStep(RunJavaScriptCoreTests) self.addStep(self.TestClass) # Tiger's Python 2.3 is too old. WebKit Python requires 2.5+. # Sadly we have no way to detect the version on the slave from here. diff --git a/WebKitTools/BuildSlaveSupport/test-result-archive b/WebKitTools/BuildSlaveSupport/test-result-archive index 3b019c0..df02dbd 100644 --- a/WebKitTools/BuildSlaveSupport/test-result-archive +++ b/WebKitTools/BuildSlaveSupport/test-result-archive @@ -46,7 +46,7 @@ def main(): return archiveTestResults(options.configuration, options.platform) def archiveTestResults(configuration, platform): - assert platform in ('mac', 'win', 'gtk', 'qt') + assert platform in ('mac', 'win', 'gtk', 'qt', 'chromium') try: os.unlink(archiveFile) @@ -66,7 +66,7 @@ def archiveTestResults(configuration, platform): if platform == 'mac': if subprocess.call(["ditto", "-c", "-k", "--sequesterRsrc", layoutTestResultsDir, archiveFile]): return 1 - elif platform in ('win', 'gtk', 'qt'): + elif platform in ('win', 'gtk', 'qt', 'chromium'): if subprocess.call(["zip", "-r", archiveFile, "."], cwd=layoutTestResultsDir): return 1 |