Unreviewed, rolling out r191995.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Nov 2015 05:45:51 +0000 (05:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Nov 2015 05:45:51 +0000 (05:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150880

Broke iOS tests (Requested by ap on #webkit).

Reverted changeset:

"run-webkit-test should look in --root directory for
LayoutTestRelay"
https://bugs.webkit.org/show_bug.cgi?id=150859
http://trac.webkit.org/changeset/191995

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

Tools/ChangeLog
Tools/Scripts/webkitpy/port/ios.py

index 8b52354..9a8a111 100644 (file)
@@ -1,3 +1,17 @@
+2015-11-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r191995.
+        https://bugs.webkit.org/show_bug.cgi?id=150880
+
+        Broke iOS tests (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "run-webkit-test should look in --root directory for
+        LayoutTestRelay"
+        https://bugs.webkit.org/show_bug.cgi?id=150859
+        http://trac.webkit.org/changeset/191995
+
 2015-11-03  Said Abou-Hallawa  <sabouhallawa@apple.com>
 
         Add graphics benchmark to performance bot
index 870f239..c704892 100644 (file)
@@ -123,12 +123,8 @@ class IOSSimulatorPort(Port):
     @property
     @memoized
     def relay_path(self):
-        if self._root_was_set:
-            path = self._filesystem.abspath(self.get_option('root'))
-        else:
-            mac_config = port_config.Config(self._executive, self._filesystem, 'mac')
-            path = mac_config.build_directory(self.get_option('configuration'))
-        return self._filesystem.join(path, 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'):