Changeset 89138 in webkit
- Timestamp:
- Jun 17, 2011 8:31:24 AM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
r89054 r89138 149 149 logfiles = {'actual.html (source)': 'Source/JavaScriptCore/tests/mozilla/actual.html'} 150 150 151 def __init__(self, skipBuild=False, *args, **kwargs):152 self. skipBuild = skipBuild151 def __init__(self, buildJSCTool=True, *args, **kwargs): 152 self.buildJSCTool = buildJSCTool 153 153 shell.Test.__init__(self, *args, **kwargs) 154 self.addFactoryArguments( skipBuild=skipBuild)154 self.addFactoryArguments(buildJSCTool=buildJSCTool) 155 155 156 156 def start(self): 157 157 appendCustomBuildFlags(self, self.getProperty('platform')) 158 if self.skipBuild:159 self.setCommand(self.command + ['-- skip-build'])158 if not self.buildJSCTool: 159 self.setCommand(self.command + ['--no-build']) 160 160 return shell.Test.start(self) 161 161 … … 200 200 WithProperties("--%(configuration)s"), "--exit-after-n-crashes-or-timeouts", "20", "--exit-after-n-failures", "500"] 201 201 202 def __init__(self, skipBuild=False, *args, **kwargs):203 self. skipBuild = skipBuild202 def __init__(self, buildJSCTool=True, *args, **kwargs): 203 self.buildJSCTool = buildJSCTool 204 204 shell.Test.__init__(self, *args, **kwargs) 205 self.addFactoryArguments( skipBuild=skipBuild)205 self.addFactoryArguments(buildJSCTool=buildJSCTool) 206 206 207 207 def start(self): … … 212 212 else: 213 213 rootArgument = ['--root=WebKitBuild/bin'] 214 if self.skipBuild:214 if not self.buildJSCTool: 215 215 self.setCommand(self.command + rootArgument) 216 216 return shell.Test.start(self) … … 526 526 self.addStep(DownloadBuiltProduct) 527 527 self.addStep(ExtractBuiltProduct) 528 self.addStep(RunJavaScriptCoreTests, skipBuild=True)529 self.addStep(self.TestClass, skipBuild=(platform == 'win'))528 self.addStep(RunJavaScriptCoreTests, buildJSCTool=False) 529 self.addStep(self.TestClass, buildJSCTool=(platform != 'win')) 530 530 531 531 # FIXME: Only running in debug mode due to https://bugs.webkit.org/show_bug.cgi?id=61812 -
trunk/Tools/ChangeLog
r89136 r89138 1 2011-06-17 Daniel Bates <dbates@rim.com> 2 3 Rubber-stamped by Eric Seidel. 4 5 Remove run-javascriptcore-tests --skip-build option; Instead add --build/no-build options 6 https://bugs.webkit.org/show_bug.cgi?id=62767 7 8 Part 2 of 3 9 10 Update the BuildBot master.cfg to use the new --no-build run-javascriptcore-tests 11 command line option instead of --skip-build. 12 13 We'll remove --skip-build from run-javascriptcore-test in a follow up patch once the 14 master buildbot picks up the change. 15 16 * BuildSlaveSupport/build.webkit.org-config/master.cfg: 17 1 18 2011-06-17 Daniel Bates <dbates@rim.com> 2 19
Note: See TracChangeset
for help on using the changeset viewer.