<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179622] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179622">179622</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-04 12:26:23 -0800 (Wed, 04 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>test-webkitpy fails on Mac without iphoneos SDK
https://bugs.webkit.org/show_bug.cgi?id=141255
<rdar://problem/19619691>
Reviewed by David Kilzer and Alexey Proskuryakov.
Fixes an issue where test-webkitpy fails on a Mac without the iOS SDK. We should
should not require the iphoneos SDK to be installed to run the webkitpy tests.
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo.xcode_sdk_version): Added; return the version of the specified SDK, if
installed. We take advantage of the behavior that xcrun --show-sdk-version only writes
to standard output if the SDK is installed to return the empty string if the SDK is
not installed.
* Scripts/webkitpy/common/system/platforminfo_mock.py:
(MockPlatformInfo.xcode_sdk_version): Added.
* Scripts/webkitpy/port/ios.py:
(IOSPort.determine_full_port_name): Modified to call PlatformInfo.xcode_sdk_version()
to get the version of the iphoneos SDK, if installed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemplatforminfopy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemplatforminfo_mockpy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179621 => 179622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-04 20:03:52 UTC (rev 179621)
+++ trunk/Tools/ChangeLog 2015-02-04 20:26:23 UTC (rev 179622)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-02-04 Daniel Bates <dabates@apple.com>
+
+ test-webkitpy fails on Mac without iphoneos SDK
+ https://bugs.webkit.org/show_bug.cgi?id=141255
+ <rdar://problem/19619691>
+
+ Reviewed by David Kilzer and Alexey Proskuryakov.
+
+ Fixes an issue where test-webkitpy fails on a Mac without the iOS SDK. We should
+ should not require the iphoneos SDK to be installed to run the webkitpy tests.
+
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo.xcode_sdk_version): Added; return the version of the specified SDK, if
+ installed. We take advantage of the behavior that xcrun --show-sdk-version only writes
+ to standard output if the SDK is installed to return the empty string if the SDK is
+ not installed.
+ * Scripts/webkitpy/common/system/platforminfo_mock.py:
+ (MockPlatformInfo.xcode_sdk_version): Added.
+ * Scripts/webkitpy/port/ios.py:
+ (IOSPort.determine_full_port_name): Modified to call PlatformInfo.xcode_sdk_version()
+ to get the version of the iphoneos SDK, if installed.
+
</ins><span class="cx"> 2015-02-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> run-webkit-tests doesn't always capture ASan violation reports
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfopy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (179621 => 179622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2015-02-04 20:03:52 UTC (rev 179621)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2015-02-04 20:26:23 UTC (rev 179622)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> import re
</span><span class="cx"> import sys
</span><span class="cx">
</span><ins>+from webkitpy.common.system.executive import Executive
</ins><span class="cx">
</span><span class="cx"> class PlatformInfo(object):
</span><span class="cx"> """This class provides a consistent (and mockable) interpretation of
</span><span class="lines">@@ -118,6 +119,12 @@
</span><span class="cx"> except:
</span><span class="cx"> return sys.maxint
</span><span class="cx">
</span><ins>+ def xcode_sdk_version(self, sdk_name):
+ if self.is_mac():
+ # Assumes that xcrun does not write to standard output on failure (e.g. SDK does not exist).
+ return self._executive.run_command(["xcrun", "--sdk", sdk_name, "--show-sdk-version"], return_stderr=False, error_handler=Executive.ignore_error).rstrip()
+ return ''
+
</ins><span class="cx"> def _determine_os_name(self, sys_platform):
</span><span class="cx"> if sys_platform == 'darwin':
</span><span class="cx"> return 'mac'
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfo_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py (179621 => 179622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py 2015-02-04 20:03:52 UTC (rev 179621)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py 2015-02-04 20:26:23 UTC (rev 179622)
</span><span class="lines">@@ -55,3 +55,6 @@
</span><span class="cx">
</span><span class="cx"> def terminal_width(self):
</span><span class="cx"> return 80
</span><ins>+
+ def xcode_sdk_version(self, sdk_name):
+ return '8.1'
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (179621 => 179622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-02-04 20:03:52 UTC (rev 179621)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-02-04 20:26:23 UTC (rev 179622)
</span><span class="lines">@@ -52,16 +52,11 @@
</span><span class="cx"> @classmethod
</span><span class="cx"> def determine_full_port_name(cls, host, options, port_name):
</span><span class="cx"> if port_name == cls.port_name:
</span><del>- sdk_version = '8.0'
- # FIXME: We should move the call to xcrun to the PlatformInfo object so that
- # we can use MockPlatformInfo to set an expectation when running the unit tests.
- if os.path.isfile('/usr/bin/xcrun'):
- sdk_command_output = subprocess.check_output(['/usr/bin/xcrun', '--sdk', 'iphoneos', '--show-sdk-version'], stderr=None).rstrip()
- if sdk_command_output:
- sdk_version = sdk_command_output
-
- port_name = port_name + '-' + re.match('^([0-9]+)', sdk_version).group(1)
-
</del><ins>+ iphoneos_sdk_version = host.platform.xcode_sdk_version('iphoneos')
+ if not iphoneos_sdk_version:
+ raise Exception("Ensure that the Xcode command line tools and the iphoneos SDK are installed.")
+ major_version_number = iphoneos_sdk_version.split('.')[0]
+ port_name = port_name + '-' + major_version_number
</ins><span class="cx"> return port_name
</span><span class="cx">
</span><span class="cx"> def __init__(self, *args, **kwargs):
</span></span></pre>
</div>
</div>
</body>
</html>