[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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0f21416..82604ea 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,25 @@
+2015-01-27  Daniel Bates  <dabates@apple.com>
+
+        [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  <ap@apple.com>
 
         Update bots on the flakiness dashboard

diff --git a/Tools/Scripts/webkitpy/port/builders.py b/Tools/Scripts/webkitpy/port/builders.py
index d49c8ce..86cfe97 100644 (file)
--- a/Tools/Scripts/webkitpy/port/builders.py
+++ b/Tools/Scripts/webkitpy/port/builders.py
@@ -91,6 +91,8 @@ _fuzzy_matches = {
 
 
 _ports_without_builders = [
+    r"ios-simulator",
+    r"ios-simulator-wk2",
 ]
 
 

diff --git a/Tools/Scripts/webkitpy/port/ios.py b/Tools/Scripts/webkitpy/port/ios.py
index 56e2416..d57cd43 100644 (file)
--- a/Tools/Scripts/webkitpy/port/ios.py
+++ b/Tools/Scripts/webkitpy/port/ios.py
@@ -96,8 +96,6 @@ class IOSSimulatorPort(Port):
             # 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 @@ class IOSSimulatorPort(Port):
 
     @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'):