Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (126043 => 126044)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-08-20 18:11:22 UTC (rev 126043)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-08-20 18:16:45 UTC (rev 126044)
@@ -107,6 +107,7 @@
self.setProperty("configuration", self.configuration)
self.setProperty("architecture", self.architecture)
self.setProperty("buildOnly", self.buildOnly)
+ self.setProperty("shouldAbortEarly", True)
self.finished(SUCCESS)
return defer.succeed(None)
@@ -298,9 +299,7 @@
"--build-number", WithProperties("%(buildnumber)s"),
"--master-name", "webkit.org",
"--test-results-server", "test-results.appspot.com",
- WithProperties("--%(configuration)s"),
- "--exit-after-n-crashes-or-timeouts", "20",
- "--exit-after-n-failures", "500"]
+ WithProperties("--%(configuration)s")]
def __init__(self, buildJSCTool=True, *args, **kwargs):
self.buildJSCTool = buildJSCTool
@@ -309,9 +308,13 @@
def start(self):
platform = self.getProperty('platform')
+ shouldAbortEarly = self.getProperty('shouldAbortEarly')
appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
if platform.startswith('mac'):
self.setCommand(self.command + ['--no-build'])
+ if shouldAbortEarly:
+ self.setCommand(self.command + ["--exit-after-n-crashes-or-timeouts", "20", "--exit-after-n-failures", "500"])
+
if platform == "win":
rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
self.setCommand(self.command + ['--no-build'])
@@ -596,6 +599,7 @@
class RunWebKit2Tests(RunWebKitTests):
def start(self):
+ self.setProperty("shouldAbortEarly", False)
self.setCommand(self.command + ["--webkit-test-runner"])
return RunWebKitTests.start(self)
Modified: trunk/Tools/ChangeLog (126043 => 126044)
--- trunk/Tools/ChangeLog 2012-08-20 18:11:22 UTC (rev 126043)
+++ trunk/Tools/ChangeLog 2012-08-20 18:16:45 UTC (rev 126044)
@@ -1,3 +1,18 @@
+2012-08-20 Brady Eidson <[email protected]>
+
+ Temporarily disable the 20+ crash and 500+ failure options on WK2 bots.
+ https://bugs.webkit.org/show_bug.cgi?id=94506
+
+ Reviewed by Dirk Pranke.
+
+ When running WK2 tests, don't add the "abort early" command line options.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (ConfigureBuild.start):
+ (RunWebKitTests):
+ (RunWebKitTests.start):
+ (RunWebKit2Tests.start):
+
2012-08-19 Stephanie Lewis <[email protected]>
Add mountain lion to build config.
