Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (89137 => 89138)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-06-17 15:08:09 UTC (rev 89137)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-06-17 15:31:24 UTC (rev 89138)
@@ -148,15 +148,15 @@
command = ["perl", "./Tools/Scripts/run-_javascript_core-tests", WithProperties("--%(configuration)s")]
logfiles = {'actual.html (source)': 'Source/_javascript_Core/tests/mozilla/actual.html'}
- def __init__(self, skipBuild=False, *args, **kwargs):
- self.skipBuild = skipBuild
+ def __init__(self, buildJSCTool=True, *args, **kwargs):
+ self.buildJSCTool = buildJSCTool
shell.Test.__init__(self, *args, **kwargs)
- self.addFactoryArguments(skipBuild=skipBuild)
+ self.addFactoryArguments(buildJSCTool=buildJSCTool)
def start(self):
appendCustomBuildFlags(self, self.getProperty('platform'))
- if self.skipBuild:
- self.setCommand(self.command + ['--skip-build'])
+ if not self.buildJSCTool:
+ self.setCommand(self.command + ['--no-build'])
return shell.Test.start(self)
def commandComplete(self, cmd):
@@ -199,10 +199,10 @@
"--no-sample-on-timeout", "--results-directory", "layout-test-results", "--use-remote-links-to-tests",
WithProperties("--%(configuration)s"), "--exit-after-n-crashes-or-timeouts", "20", "--exit-after-n-failures", "500"]
- def __init__(self, skipBuild=False, *args, **kwargs):
- self.skipBuild = skipBuild
+ def __init__(self, buildJSCTool=True, *args, **kwargs):
+ self.buildJSCTool = buildJSCTool
shell.Test.__init__(self, *args, **kwargs)
- self.addFactoryArguments(skipBuild=skipBuild)
+ self.addFactoryArguments(buildJSCTool=buildJSCTool)
def start(self):
platform = self.getProperty('platform')
@@ -211,7 +211,7 @@
rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
else:
rootArgument = ['--root=WebKitBuild/bin']
- if self.skipBuild:
+ if not self.buildJSCTool:
self.setCommand(self.command + rootArgument)
return shell.Test.start(self)
@@ -525,8 +525,8 @@
self.addStep(StartATSServer)
self.addStep(DownloadBuiltProduct)
self.addStep(ExtractBuiltProduct)
- self.addStep(RunJavaScriptCoreTests, skipBuild=True)
- self.addStep(self.TestClass, skipBuild=(platform == 'win'))
+ self.addStep(RunJavaScriptCoreTests, buildJSCTool=False)
+ self.addStep(self.TestClass, buildJSCTool=(platform != 'win'))
# FIXME: Only running in debug mode due to https://bugs.webkit.org/show_bug.cgi?id=61812
if configuration == "debug":
Modified: trunk/Tools/ChangeLog (89137 => 89138)
--- trunk/Tools/ChangeLog 2011-06-17 15:08:09 UTC (rev 89137)
+++ trunk/Tools/ChangeLog 2011-06-17 15:31:24 UTC (rev 89138)
@@ -5,6 +5,23 @@
Remove run-_javascript_core-tests --skip-build option; Instead add --build/no-build options
https://bugs.webkit.org/show_bug.cgi?id=62767
+ Part 2 of 3
+
+ Update the BuildBot master.cfg to use the new --no-build run-_javascript_core-tests
+ command line option instead of --skip-build.
+
+ We'll remove --skip-build from run-_javascript_core-test in a follow up patch once the
+ master buildbot picks up the change.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
+2011-06-17 Daniel Bates <[email protected]>
+
+ Rubber-stamped by Eric Seidel.
+
+ Remove run-_javascript_core-tests --skip-build option; Instead add --build/no-build options
+ https://bugs.webkit.org/show_bug.cgi?id=62767
+
Part 1 of 3
Towards renaming the option --skip-build to --no-build. Add --build/--no-build options to
