Title: [179216] trunk/Tools
- Revision
- 179216
- Author
- [email protected]
- Date
- 2015-01-27 14:07:50 -0800 (Tue, 27 Jan 2015)
Log Message
[iOS] run-webkit-tests --platform=ios* --lint-test-files does not work
https://bugs.webkit.org/show_bug.cgi?id=140949
Reviewed by Alexey Proskuryakov.
Add "ios-simulator" and "ios-simulator-wk2" to the list of ports without
builders so that run-webkit-tests can lint the appropriate TestExpectation
files.
* Scripts/webkitpy/port/builders.py:
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.__init__): Move logic to query for the Mac build directory from here...
(IOSSimulatorPort.relay_path): to here as this is the only caller that makes use of that
information to find the LayoutTestRelay tool. Otherwise, "self.assertEqual(len(calls), 1)"
in unit test webkitpy.tool.commands.rebaseline_unittest.TestRebaselineExpectations.test_rebaseline_expectations
will fail because IOSSimulatorPort.__init__() ultimately calls Tools/Scripts/webkit-build-directory
to determine the Mac build directory for each instantiation of IOSSimulatorPort. And this unit
test instantiates a port object for each builder listed in file Scripts/webkitpy/port/builders.py.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (179215 => 179216)
--- trunk/Tools/ChangeLog 2015-01-27 22:05:58 UTC (rev 179215)
+++ trunk/Tools/ChangeLog 2015-01-27 22:07:50 UTC (rev 179216)
@@ -1,3 +1,25 @@
+2015-01-27 Daniel Bates <[email protected]>
+
+ [iOS] run-webkit-tests --platform=ios* --lint-test-files does not work
+ https://bugs.webkit.org/show_bug.cgi?id=140949
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add "ios-simulator" and "ios-simulator-wk2" to the list of ports without
+ builders so that run-webkit-tests can lint the appropriate TestExpectation
+ files.
+
+ * Scripts/webkitpy/port/builders.py:
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.__init__): Move logic to query for the Mac build directory from here...
+ (IOSSimulatorPort.relay_path): to here as this is the only caller that makes use of that
+ information to find the LayoutTestRelay tool. Otherwise, "self.assertEqual(len(calls), 1)"
+ in unit test webkitpy.tool.commands.rebaseline_unittest.TestRebaselineExpectations.test_rebaseline_expectations
+ will fail because IOSSimulatorPort.__init__() ultimately calls Tools/Scripts/webkit-build-directory
+ to determine the Mac build directory for each instantiation of IOSSimulatorPort. And this unit
+ test instantiates a port object for each builder listed in file Scripts/webkitpy/port/builders.py.
+
+
2015-01-27 Alexey Proskuryakov <[email protected]>
Update bots on the flakiness dashboard
Modified: trunk/Tools/Scripts/webkitpy/port/builders.py (179215 => 179216)
--- trunk/Tools/Scripts/webkitpy/port/builders.py 2015-01-27 22:05:58 UTC (rev 179215)
+++ trunk/Tools/Scripts/webkitpy/port/builders.py 2015-01-27 22:07:50 UTC (rev 179216)
@@ -91,6 +91,8 @@
_ports_without_builders = [
+ r"ios-simulator",
+ r"ios-simulator-wk2",
]
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (179215 => 179216)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-27 22:05:58 UTC (rev 179215)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-27 22:07:50 UTC (rev 179216)
@@ -96,8 +96,6 @@
# DumpRenderTree slows down noticably if we run more than about 1000 tests in a batch
# with MallocStackLogging enabled.
self.set_option_default("batch_size", 1000)
- mac_config = port_config.Config(self._executive, self._filesystem, 'mac')
- self._mac_build_directory = mac_config.build_directory(self.get_option('configuration'))
self._testing_device = None
@@ -110,7 +108,8 @@
@property
def relay_path(self):
- return self._filesystem.join(self._mac_build_directory, self.relay_name)
+ mac_config = port_config.Config(self._executive, self._filesystem, 'mac')
+ return self._filesystem.join(mac_config.build_directory(self.get_option('configuration')), self.relay_name)
def default_timeout_ms(self):
if self.get_option('guard_malloc'):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
