Title: [92294] trunk/Tools
- Revision
- 92294
- Author
- [email protected]
- Date
- 2011-08-03 11:11:12 -0700 (Wed, 03 Aug 2011)
Log Message
Teach BuilderToPort to distinguish between Release and Debug builders.
https://bugs.webkit.org/show_bug.cgi?id=65628
Reviewed by Adam Barth.
* Scripts/webkitpy/tool/commands/rebaseline.py: Added a smart options object and passed it to port factory.
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py: Added tests.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (92293 => 92294)
--- trunk/Tools/ChangeLog 2011-08-03 17:55:14 UTC (rev 92293)
+++ trunk/Tools/ChangeLog 2011-08-03 18:11:12 UTC (rev 92294)
@@ -1,3 +1,13 @@
+2011-08-03 Dimitri Glazkov <[email protected]>
+
+ Teach BuilderToPort to distinguish between Release and Debug builders.
+ https://bugs.webkit.org/show_bug.cgi?id=65628
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/tool/commands/rebaseline.py: Added a smart options object and passed it to port factory.
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py: Added tests.
+
2011-08-03 Caio Marcelo de Oliveira Filho <[email protected]>
[Qt] Fix running qmltests for WK2 in the bot
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (92293 => 92294)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2011-08-03 17:55:14 UTC (rev 92293)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2011-08-03 18:11:12 UTC (rev 92294)
@@ -43,8 +43,18 @@
from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
+class RebaseliningOptions(object):
+
+ DEBUG_CONFIGURATION_REGEX = r"[d|D](ebu|b)g"
+
+ def __init__(self, builder_name):
+ self.configuration = "Debug" if re.search(self.DEBUG_CONFIGURATION_REGEX, builder_name) else "Release"
+ self.builder_name = builder_name
+
+
# FIXME: This logic should be moved to builders.py.
class BuilderToPort(object):
+
_builder_name_to_port_name = {
# These builders are on build.webkit.org.
r"SnowLeopard": "mac-snowleopard",
@@ -60,8 +70,8 @@
r"Webkit Win$": "chromium-win-xp",
r"Webkit Vista": "chromium-win-vista",
r"Webkit Win7": "chromium-win-win7",
- r"Webkit Win \(dbg\)\(1\)": "chromium-win-win7", # FIXME: Is this correct?
- r"Webkit Win \(dbg\)\(2\)": "chromium-win-win7", # FIXME: Is this correct?
+ r"Webkit Win \(dbg\)\(1\)": "chromium-win-xp",
+ r"Webkit Win \(dbg\)\(2\)": "chromium-win-xp",
r"Webkit Linux": "chromium-linux-x86_64",
r"Webkit Linux 32": "chromium-linux-x86",
r"Webkit Linux \(dbg\)\(1\)": "chromium-linux-x86_64",
@@ -81,7 +91,7 @@
def port_for_builder(self, builder_name):
port_name = self._port_name_for_builder_name(builder_name)
assert(port_name) # Need to update _builder_name_to_port_name
- port = factory.get(port_name)
+ port = factory.get(port_name, RebaseliningOptions(builder_name))
assert(port) # Need to update _builder_name_to_port_name
return port
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (92293 => 92294)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2011-08-03 17:55:14 UTC (rev 92293)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2011-08-03 18:11:12 UTC (rev 92294)
@@ -56,4 +56,8 @@
def test_port_for_builder(self):
converter = BuilderToPort()
port = converter.port_for_builder("Leopard Intel Debug (Tests)")
- self.assertEqual(port.name(), "mac-leopard")
+ self.assertEqual(str(port.test_configuration()), "<leopard, x86, debug, cpu>")
+ port = converter.port_for_builder("Leopard Intel Release (Tests)")
+ self.assertEqual(str(port.test_configuration()), "<leopard, x86, release, cpu>")
+ port = converter.port_for_builder("Webkit Win (dbg)(1)")
+ self.assertEqual(str(port.test_configuration()), "<xp, x86, debug, cpu>")
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
