diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:03:35 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | e458d70a0d18538346f41b503114c9ebe6b2ce12 (patch) | |
| tree | 86f1637deca2c524432a822e5fcedd4bef221091 /WebKitTools/BuildSlaveSupport | |
| parent | f43eabc081f7ce6af24b9df4953498a3cd6ca24d (diff) | |
| download | external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.zip external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.gz external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.bz2 | |
Merge WebKit at r63173 : Initial merge by git.
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
Diffstat (limited to 'WebKitTools/BuildSlaveSupport')
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json | 6 | ||||
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json index 81e3f91..bda3921 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -21,6 +21,8 @@ { "name": "apple-windows-2", "platform": "win"}, { "name": "apple-windows-3", "platform": "win"}, { "name": "apple-windows-4", "platform": "win"}, + { "name": "apple-windows-5", "platform": "win"}, + { "name": "apple-windows-6", "platform": "win"}, { "name": "gtk-linux-slave-1", "platform": "gtk"}, { "name": "gtk-linux-slave-2", "platform": "gtk"}, @@ -90,7 +92,7 @@ { "name": "Windows Release (Tests)", "type": "Test", "builddir": "win-release-tests", "platform": "win", "configuration": "release", "architectures": ["i386"], - "slavenames": ["apple-windows-4", "apple-windows-3", "test-slave"] + "slavenames": ["apple-windows-4", "apple-windows-3", "apple-windows-5", "apple-windows-6", "test-slave"] }, { "name": "Windows Debug (Build)", "type": "Build", "builddir": "win-debug", @@ -101,7 +103,7 @@ { "name": "Windows Debug (Tests)", "type": "Test", "builddir": "win-debug-tests", "platform": "win", "configuration": "debug", "architectures": ["i386"], - "slavenames": ["apple-windows-4", "apple-windows-3", "test-slave"] + "slavenames": ["apple-windows-4", "apple-windows-3", "apple-windows-5", "apple-windows-6", "test-slave"] }, { "name": "GTK Linux 32-bit Release", "type": "BuildAndTest", "builddir": "gtk-linux-32-release", diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg index bbc94ec..c36c5c7 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -181,7 +181,7 @@ class RunWebKitTests(shell.Test): descriptionDone = ["layout-tests"] command = ["perl", "./WebKitTools/Scripts/run-webkit-tests", "--no-launch-safari", "--no-new-test-results", "--no-sample-on-timeout", "--results-directory", "layout-test-results", "--use-remote-links-to-tests", - WithProperties("--%(configuration)s"), "--exit-after-n-failures", "20"] + WithProperties("--%(configuration)s"), "--exit-after-n-crashes-or-timeouts", "20"] def __init__(self, skipBuild=False, *args, **kwargs): self.skipBuild = skipBuild |