<!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>[212148] trunk</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/212148">212148</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-02-10 13:58:23 -0800 (Fri, 10 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removing LayoutTestRelay
https://bugs.webkit.org/show_bug.cgi?id=165927
Reviewed by Daniel Bates.
Part 2
LayoutTestRelay uses SPI, since recent versions of the iOS SDK allow for installing apps on
simulators through simctl (iOS 10 and later), use this functionality instead.
Source/WebCore:
* platform/RuntimeApplicationChecks.mm:
(WebCore::IOSApplication::isDumpRenderTree): Update comment to reflect removal of LayoutTestRelay.
Tools:
* BuildSlaveSupport/built-product-archive:
(archiveBuiltProduct): Remove archiving of LayoutTestRelay as it is no longer being built.
Added a FIXME that we will need to implement similar archiving machinery once we build
ImageDiff for Mac when building WebKit for iOS. Currently ImageDiff is built with the iOS SDK.
* BuildSlaveSupport/kill-old-processes:
(main): Remove LayoutTestRelay from list of processes.
* LayoutTestRelay: Removed LayoutTestRelay.
* Makefile:
* Scripts/build-layouttestrelay: Removed.
* Scripts/build-webkit: Removed LayoutTestRelay references.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksmm">trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuiltproductarchive">trunk/Tools/BuildSlaveSupport/built-product-archive</a></li>
<li><a href="#trunkToolsBuildSlaveSupportkilloldprocesses">trunk/Tools/BuildSlaveSupport/kill-old-processes</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMakefile">trunk/Tools/Makefile</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Tools/LayoutTestRelay/</li>
<li><a href="#trunkToolsScriptsbuildlayouttestrelay">trunk/Tools/Scripts/build-layouttestrelay</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212147 => 212148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-10 21:51:44 UTC (rev 212147)
+++ trunk/Source/WebCore/ChangeLog 2017-02-10 21:58:23 UTC (rev 212148)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-10 Jonathan Bedard <jbedard@apple.com>
+
+ Removing LayoutTestRelay
+ https://bugs.webkit.org/show_bug.cgi?id=165927
+
+ Reviewed by Daniel Bates.
+ Part 2
+
+ LayoutTestRelay uses SPI, since recent versions of the iOS SDK allow for installing apps on
+ simulators through simctl (iOS 10 and later), use this functionality instead.
+
+ * platform/RuntimeApplicationChecks.mm:
+ (WebCore::IOSApplication::isDumpRenderTree): Update comment to reflect removal of LayoutTestRelay.
+
</ins><span class="cx"> 2017-02-10 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Implement Outgoing libwebrtc audio source support
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm (212147 => 212148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm 2017-02-10 21:51:44 UTC (rev 212147)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm 2017-02-10 21:58:23 UTC (rev 212148)
</span><span class="lines">@@ -178,8 +178,8 @@
</span><span class="cx">
</span><span class="cx"> bool IOSApplication::isDumpRenderTree()
</span><span class="cx"> {
</span><del>- // We use a prefix match instead of strict equality since LayoutTestRelay may launch multiple instances of
- // DumpRenderTree where the bundle identifier of each instance has a unique suffix.
</del><ins>+ // We use a prefix match instead of strict equality since multiple instances of DumpRenderTree
+ // may be launched, where the bundle identifier of each instance has a unique suffix.
</ins><span class="cx"> static bool isDumpRenderTree = applicationBundleIsEqualTo("org.webkit.DumpRenderTree"); // e.g. org.webkit.DumpRenderTree0
</span><span class="cx"> return isDumpRenderTree;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuiltproductarchive"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (212147 => 212148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/built-product-archive 2017-02-10 21:51:44 UTC (rev 212147)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2017-02-10 21:58:23 UTC (rev 212148)
</span><span class="lines">@@ -165,29 +165,9 @@
</span><span class="cx"> def archiveBuiltProduct(configuration, platform, fullPlatform):
</span><span class="cx"> assert platform in ('mac', 'win', 'gtk', 'efl', 'ios')
</span><span class="cx">
</span><del>- if fullPlatform.startswith('ios-simulator'):
- # We need to include in the archive the Mac tool, LayoutTestRelay, to run layout tests in the iOS simulator.
- combinedDirectory = os.path.join(_topLevelBuildDirectory, 'combined-mac-and-ios')
- removeDirectoryIfExists(combinedDirectory)
- os.makedirs(combinedDirectory)
-
- if subprocess.call(['/bin/cp', '-pR', _configurationBuildDirectory, combinedDirectory]):
- return 1
-
- macBuildDirectory = webkitBuildDirectoryForConfigurationAndPlatform(configuration, 'mac')
- destinationDirectory = os.path.join(combinedDirectory, os.path.relpath(macBuildDirectory, _topLevelBuildDirectory))
- os.makedirs(destinationDirectory)
- for filename in ['LayoutTestRelay', 'LayoutTestRelay.dSYM']:
- sourceFile = os.path.join(macBuildDirectory, filename)
- if not os.path.exists(sourceFile):
- continue
- if subprocess.call(['/bin/cp', '-pR', sourceFile, destinationDirectory]):
- return 1
-
- if createZip(combinedDirectory, configuration):
- return 1
- shutil.rmtree(combinedDirectory)
- elif platform in ('mac', 'ios'):
</del><ins>+ # FIXME: ImageDiff should be built with the host SDK, <rdar://problem/30266038>.
+ # An approach similar to the one used for LayoutTestRelay in r190515 should be imlemented.
+ if platform in ('mac', 'ios'):
</ins><span class="cx"> return createZip(_configurationBuildDirectory, configuration, embedParentDirectoryNameOnDarwin=True)
</span><span class="cx"> elif platform == 'win':
</span><span class="cx"> # FIXME: We shouldn't hardcode the assumption of a 32-bit build. See <https://bugs.webkit.org/show_bug.cgi?id=149715>.
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportkilloldprocesses"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (212147 => 212148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/kill-old-processes 2017-02-10 21:51:44 UTC (rev 212147)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2017-02-10 21:58:23 UTC (rev 212148)
</span><span class="lines">@@ -90,7 +90,6 @@
</span><span class="cx"> "xcodebuild",
</span><span class="cx"> # FIXME: Consider moving iOS-specific tasks to their own list.
</span><span class="cx"> "Simulator",
</span><del>- "LayoutTestRelay"
</del><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> taskToKillUnix = [
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (212147 => 212148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-10 21:51:44 UTC (rev 212147)
+++ trunk/Tools/ChangeLog 2017-02-10 21:58:23 UTC (rev 212148)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-10 Jonathan Bedard <jbedard@apple.com>
+
+ Removing LayoutTestRelay
+ https://bugs.webkit.org/show_bug.cgi?id=165927
+
+ Reviewed by Daniel Bates.
+ Part 2
+
+ LayoutTestRelay uses SPI, since recent versions of the iOS SDK allow for installing apps on
+ simulators through simctl (iOS 10 and later), use this functionality instead.
+
+ * BuildSlaveSupport/built-product-archive:
+ (archiveBuiltProduct): Remove archiving of LayoutTestRelay as it is no longer being built.
+ Added a FIXME that we will need to implement similar archiving machinery once we build
+ ImageDiff for Mac when building WebKit for iOS. Currently ImageDiff is built with the iOS SDK.
+ * BuildSlaveSupport/kill-old-processes:
+ (main): Remove LayoutTestRelay from list of processes.
+ * LayoutTestRelay: Removed LayoutTestRelay.
+ * Makefile:
+ * Scripts/build-layouttestrelay: Removed.
+ * Scripts/build-webkit: Removed LayoutTestRelay references.
+
</ins><span class="cx"> 2017-02-10 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebCrypto] Add WebCryptoAPI to watchlist
</span></span></pre></div>
<a id="trunkToolsMakefile"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Makefile (212147 => 212148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Makefile 2017-02-10 21:51:44 UTC (rev 212147)
+++ trunk/Tools/Makefile 2017-02-10 21:58:23 UTC (rev 212148)
</span><span class="lines">@@ -7,9 +7,6 @@
</span><span class="cx"> ifneq (,$(findstring iphone,$(SDKROOT)))
</span><span class="cx"> MODULES += MobileMiniBrowser
</span><span class="cx"> endif
</span><del>- ifeq (,$(DO_NOT_BUILD_LAYOUT_TEST_RELAY))
- MODULES += LayoutTestRelay
- endif
</del><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> all:
</span></span></pre></div>
<a id="trunkToolsScriptsbuildlayouttestrelay"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/build-layouttestrelay (212147 => 212148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-layouttestrelay 2017-02-10 21:51:44 UTC (rev 212147)
+++ trunk/Tools/Scripts/build-layouttestrelay 2017-02-10 21:58:23 UTC (rev 212148)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-#!/usr/bin/perl -w
-
-# Copyright (C) 2014-2015 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-use strict;
-use File::Basename;
-use FindBin;
-use Getopt::Long qw(:config pass_through);
-use lib $FindBin::Bin;
-use webkitdirs;
-
-my $showHelp = 0;
-my $clean = 0;
-
-my $programName = basename($0);
-my $usage = <<EOF;
-Usage: $programName [options] [options to pass to build system]
- --help Show this help message
- --clean Clean up the build directory
-EOF
-
-my $result = GetOptions(
- 'help' => \$showHelp,
- 'clean' => \$clean,
-);
-
-if ($showHelp or not $result) {
- print STDERR $usage;
- exit 1;
-}
-
-checkRequiredSystemConfig();
-setConfiguration();
-chdirWebKit();
-
-chdir "Tools/LayoutTestRelay" or die;
-
-# FIXME: This tool is only useful when building WebKit for iOS Simulator. For now,
-# to avoid breaking some Apple Internal tools we support calling this script
-# without --ios-simulator so long as we are building on a Mac.
-if (isAppleCocoaWebKit() && !willUseIOSDeviceSDK()) {
- # FIXME: Changing SDK at this point results in an inconsistent webkitdirs state.
- # We should make it so that webkitdirs functions never see the wrong SDK.
- setXcodeSDK(undef); # Force use of Mac SDK if --ios-simulator was passed
- exit exitStatus(buildXCodeProject("LayoutTestRelay", $clean, XcodeOptions(), @ARGV));
-}
-
-print STDERR "LayoutTestRelay is only supported for iOS Simulator.\n";
-exit 1;
</del></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (212147 => 212148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2017-02-10 21:51:44 UTC (rev 212147)
+++ trunk/Tools/Scripts/build-webkit 2017-02-10 21:58:23 UTC (rev 212148)
</span><span class="lines">@@ -200,10 +200,6 @@
</span><span class="cx"> push @copyLibrariesArgs, productDir();
</span><span class="cx"> print(join(" ", @copyLibrariesArgs) . "\n");
</span><span class="cx"> (system(@copyLibrariesArgs) == 0) or die;
</span><del>-
- if (willUseIOSSimulatorSDK()) {
- (system("perl", "Tools/Scripts/build-layouttestrelay", argumentsForConfiguration()) == 0) or die;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Build Tools needed for Apple ports
</span></span></pre>
</div>
</div>
</body>
</html>