Title: [192009] trunk/Tools
Revision
192009
Author
commit-qu...@webkit.org
Date
2015-11-03 21:45:51 -0800 (Tue, 03 Nov 2015)

Log Message

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

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (192008 => 192009)


--- trunk/Tools/ChangeLog	2015-11-04 05:12:40 UTC (rev 192008)
+++ trunk/Tools/ChangeLog	2015-11-04 05:45:51 UTC (rev 192009)
@@ -1,3 +1,17 @@
+2015-11-03  Commit Queue  <commit-qu...@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  <sabouhall...@apple.com>
 
         Add graphics benchmark to performance bot

Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (192008 => 192009)


--- trunk/Tools/Scripts/webkitpy/port/ios.py	2015-11-04 05:12:40 UTC (rev 192008)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py	2015-11-04 05:45:51 UTC (rev 192009)
@@ -123,12 +123,8 @@
     @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'):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to