<!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>[204671] branches/safari-602-branch/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/204671">204671</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2016-08-19 19:51:13 -0700 (Fri, 19 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204656">r204656</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/204660">r204660</a>.
2016-08-19 Alexey Proskuryakov <ap@apple.com>
Adopt SimServiceContext in LayoutTestRelay
https://bugs.webkit.org/show_bug.cgi?id=161000
<rdar://problem/25765594>
Reviewed by Daniel Bates.
* LayoutTestRelay/LayoutTestRelay/CoreSimulatorSPI.h:
* LayoutTestRelay/LayoutTestRelay/main.m:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchToolsChangeLog">branches/safari-602-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari602branchToolsLayoutTestRelayLayoutTestRelayCoreSimulatorSPIh">branches/safari-602-branch/Tools/LayoutTestRelay/LayoutTestRelay/CoreSimulatorSPI.h</a></li>
<li><a href="#branchessafari602branchToolsLayoutTestRelayLayoutTestRelaymainm">branches/safari-602-branch/Tools/LayoutTestRelay/LayoutTestRelay/main.m</a></li>
<li><a href="#branchessafari602branchToolsScriptswebkitpyportdriverpy">branches/safari-602-branch/Tools/Scripts/webkitpy/port/driver.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/ChangeLog (204670 => 204671)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/ChangeLog 2016-08-20 02:00:44 UTC (rev 204670)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-08-20 02:51:13 UTC (rev 204671)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-19 Alexey Proskuryakov <ap@apple.com>
+
+ Merge r204656 and r204660.
+
+ 2016-08-19 Alexey Proskuryakov <ap@apple.com>
+
+ Adopt SimServiceContext in LayoutTestRelay
+ https://bugs.webkit.org/show_bug.cgi?id=161000
+ <rdar://problem/25765594>
+
+ Reviewed by Daniel Bates.
+
+ * LayoutTestRelay/LayoutTestRelay/CoreSimulatorSPI.h:
+ * LayoutTestRelay/LayoutTestRelay/main.m:
+
</ins><span class="cx"> 2016-08-11 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r203972.
</span><span class="lines">@@ -4,7 +19,8 @@
</span><span class="cx">
</span><span class="cx"> 2016-08-01 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><del>- We should not keep the JavaScript tests inside the Source/JavaScriptCore/ directory.
</del><ins>+ We should no
+ t keep the JavaScript tests inside the Source/JavaScriptCore/ directory.
</ins><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160372
</span><span class="cx">
</span><span class="cx"> Rubber stamped by Geoffrey Garen.
</span><span class="lines">@@ -19,8 +35,6 @@
</span><span class="cx"> * Scripts/run-javascriptcore-tests:
</span><span class="cx"> * Scripts/update-javascriptcore-test-res:
</span><span class="cx">
</span><del>-2016-07-31 Nan Wang <n_wang@apple.com>
->>>>>>> .merge-right.r203972
</del><span class="cx"> 2016-08-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r204062. rdar://problem/27592936
</span></span></pre></div>
<a id="branchessafari602branchToolsLayoutTestRelayLayoutTestRelayCoreSimulatorSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/LayoutTestRelay/LayoutTestRelay/CoreSimulatorSPI.h (204670 => 204671)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/LayoutTestRelay/LayoutTestRelay/CoreSimulatorSPI.h 2016-08-20 02:00:44 UTC (rev 204670)
+++ branches/safari-602-branch/Tools/LayoutTestRelay/LayoutTestRelay/CoreSimulatorSPI.h 2016-08-20 02:51:13 UTC (rev 204671)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -25,25 +25,34 @@
</span><span class="cx">
</span><span class="cx"> #if __has_include(<CoreSimulator/CoreSimulator.h>)
</span><span class="cx">
</span><ins>+/* FIXME: Remove the below #define once we require Xcode 7.3 with iOS 9.3 SDK or newer. */
</ins><span class="cx"> #define __coresim_unavailable_msg(msg)
</span><span class="cx"> #import <CoreSimulator/CoreSimulator.h>
</span><span class="cx">
</span><ins>+/* FIXME: Always use SimServiceContext once we require Xcode 7.3 with iOS 9.3 SDK or newer. */
+#define USE_SIM_SERVICE_CONTEXT defined(CORESIM_API_MAX_ALLOWED)
+
</ins><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><ins>+#define USE_SIM_SERVICE_CONTEXT 1
+
</ins><span class="cx"> #define kSimDeviceLaunchApplicationArguments @"arguments"
</span><span class="cx"> #define kSimDeviceLaunchApplicationEnvironment @"environment"
</span><span class="cx">
</span><span class="cx"> @interface SimDevice : NSObject
</span><del>-- (BOOL)installApplication:(NSURL *)installURL withOptions:(NSDictionary *)options error:(NSError **)error;
-- (pid_t)launchApplicationWithID:(NSString *)bundleID options:(NSDictionary *)options error:(NSError **)error;
</del><ins>+- (BOOL)installApplication:(NSURL *)installURL withOptions:(NSDictionary *)options error:(NSError * __autoreleasing *)error;
+- (pid_t)launchApplicationWithID:(NSString *)bundleID options:(NSDictionary *)options error:(NSError * __autoreleasing *)error;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface SimDeviceSet : NSObject
</span><del>-+ (SimDeviceSet *)defaultSet;
</del><span class="cx"> @property (readonly, copy) NSDictionary *devicesByUDID;
</span><ins>+@end
</ins><span class="cx">
</span><ins>+@interface SimServiceContext : NSObject
++(SimServiceContext *)sharedServiceContextForDeveloperDir:(NSString *)developerDir error:(NSError * __autoreleasing *)error;
+-(SimDeviceSet *)defaultDeviceSetWithError:(NSError * __autoreleasing *)error;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchToolsLayoutTestRelayLayoutTestRelaymainm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/LayoutTestRelay/LayoutTestRelay/main.m (204670 => 204671)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/LayoutTestRelay/LayoutTestRelay/main.m 2016-08-20 02:00:44 UTC (rev 204670)
+++ branches/safari-602-branch/Tools/LayoutTestRelay/LayoutTestRelay/main.m 2016-08-20 02:51:13 UTC (rev 204671)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -91,12 +91,30 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE_SIM_SERVICE_CONTEXT
+ NSString *developerDirectory = getRequiredStringArgument(@"developerDir");
+#endif
</ins><span class="cx"> NSUUID *udid = [[NSUUID alloc] initWithUUIDString:getRequiredStringArgument(@"udid")];
</span><span class="cx"> NSString *appPath = getRequiredStringArgument(@"app");
</span><span class="cx"> NSString *productDirectory = getRequiredStringArgument(@"productDir");
</span><span class="cx"> NSArray *dumpToolArguments = getDumpToolArguments();
</span><span class="cx">
</span><ins>+#if USE_SIM_SERVICE_CONTEXT
+ NSError *error;
+ SimServiceContext *serviceContext = [SimServiceContext sharedServiceContextForDeveloperDir:developerDirectory error:&error];
+ if (!serviceContext) {
+ NSLog(@"Device context couldn't be found: %@", error);
+ exit(EXIT_FAILURE);
+ }
+ SimDeviceSet *deviceSet = [serviceContext defaultDeviceSetWithError:nil];
+ if (!deviceSet) {
+ NSLog(@"Default device set couldn't be found: %@", error);
+ exit(EXIT_FAILURE);
+ }
+ SimDevice *device = [deviceSet.devicesByUDID objectForKey:udid];
+#else
</ins><span class="cx"> SimDevice *device = [SimDeviceSet.defaultSet.devicesByUDID objectForKey:udid];
</span><ins>+#endif
</ins><span class="cx"> if (!device) {
</span><span class="cx"> NSLog(@"Device %@ couldn't be found", udid);
</span><span class="cx"> exit(EXIT_FAILURE);
</span></span></pre></div>
<a id="branchessafari602branchToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/Scripts/webkitpy/port/driver.py (204670 => 204671)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/Scripts/webkitpy/port/driver.py 2016-08-20 02:00:44 UTC (rev 204670)
+++ branches/safari-602-branch/Tools/Scripts/webkitpy/port/driver.py 2016-08-20 02:51:13 UTC (rev 204671)
</span><span class="lines">@@ -594,6 +594,7 @@
</span><span class="cx"> dump_tool_args = cmd[1:]
</span><span class="cx"> product_dir = self._port._build_path()
</span><span class="cx"> relay_args = [
</span><ins>+ '-developerDir', self._port.developer_dir,
</ins><span class="cx"> '-udid', self._port.testing_device(self._worker_number).udid,
</span><span class="cx"> '-productDir', product_dir,
</span><span class="cx"> '-app', dump_tool,
</span></span></pre>
</div>
</div>
</body>
</html>