From 4da411c3991c4304cf04d0437cbd3b759b5ffe94 Mon Sep 17 00:00:00 2001 From: "jmarcell@apple.com" Date: Wed, 4 Nov 2015 00:39:29 +0000 Subject: [PATCH] run-webkit-test should look in --root directory for LayoutTestRelay https://bugs.webkit.org/show_bug.cgi?id=150859 Reviewed by Daniel Bates. For iOS run-webkit-tests, use LayoutTestRelay specified by --root; otherwise find LayoutTestRelay in the Mac build directory when --root is unspecified. * Scripts/webkitpy/port/ios.py: (IOSSimulatorPort.relay_path): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191995 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 13 +++++++++++++ Tools/Scripts/webkitpy/port/ios.py | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 7aaf2be..4927661 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,16 @@ +2015-11-03 Jason Marcell + + run-webkit-test should look in --root directory for LayoutTestRelay + https://bugs.webkit.org/show_bug.cgi?id=150859 + + Reviewed by Daniel Bates. + + For iOS run-webkit-tests, use LayoutTestRelay specified by --root; otherwise find + LayoutTestRelay in the Mac build directory when --root is unspecified. + + * Scripts/webkitpy/port/ios.py: + (IOSSimulatorPort.relay_path): + 2015-11-03 Alexey Proskuryakov build.webkit.org/dashboard should use ISO dates in Trac URLs diff --git a/Tools/Scripts/webkitpy/port/ios.py b/Tools/Scripts/webkitpy/port/ios.py index c704892..870f239 100644 --- a/Tools/Scripts/webkitpy/port/ios.py +++ b/Tools/Scripts/webkitpy/port/ios.py @@ -123,8 +123,12 @@ class IOSSimulatorPort(Port): @property @memoized def relay_path(self): - 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) + 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) def default_timeout_ms(self): if self.get_option('guard_malloc'): -- 1.8.3.1