Changeset 156570 in webkit

Timestamp:

Sep 27, 2013, 1:47:39 PM (11 years ago)

Author:

ap@apple.com

Message:

Don't hardcode builder specific configuration in buildbot master.cfg
​https://bugs.webkit.org/show_bug.cgi?id=122023

Reviewed by Mark Rowe.

• BuildSlaveSupport/build.webkit.org-config/config.json: Added an additionalArguments

property to Qt Mountain Lion Release, making it run pixel tests.

• BuildSlaveSupport/build.webkit.org-config/master.cfg:

(RunWebKitTests.start): Use additionalArguments.
(RunWebKit2Tests.start): Don't hardcode individual bot behavior here.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/config.json (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

@@ -227 +227 @@
                       "name": "Qt Mountain Lion Release", "type": "BuildAndTestWebKit2", "builddir": "qt-mountainlion-release",
                       "platform": "qt-5.0-mac-wk2", "configuration": "release", "architectures": ["x86_64"],
+                      "additionalArguments": ["--pixel"],
                       "slavenames": ["oslo-mountainlion"]
                     },

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -345 +345 @@
         shouldAbortEarly = self.getProperty('shouldAbortEarly')
         appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
+        additionalArguments = self.getProperty('additionalArguments')
         if platform.startswith('mac'):
             self.setCommand(self.command + ['--no-build'])
@@ -356 +357 @@
         if not self.buildJSCTool:
             self.setCommand(self.command + rootArgument)
+        if additionalArguments:
+            self.setCommand(self.command + additionalArguments)
         return shell.Test.start(self)
 
@@ -664 +667 @@
         self.setProperty("shouldAbortEarly", False)
         self.setCommand(self.command + ["--webkit-test-runner"])
-        if self.getProperty('buildername') == "Qt Mountain Lion Release":
-            self.setCommand(self.command + ["-p"])
 
         return RunWebKitTests.start(self)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-27  Alexey Proskuryakov  <ap@apple.com>
+
+        Don't hardcode builder specific configuration in buildbot master.cfg
+        https://bugs.webkit.org/show_bug.cgi?id=122023
+
+        Reviewed by Mark Rowe.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json: Added an additionalArguments
+        property to Qt Mountain Lion Release, making it run pixel tests.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunWebKitTests.start): Use additionalArguments.
+        (RunWebKit2Tests.start): Don't hardcode individual bot behavior here.
+
 2013-09-27  Tim Horton  <timothy_horton@apple.com>