Changeset 212148 in webkit

Timestamp:

Feb 10, 2017 1:58:23 PM (7 years ago)

Author:

Jonathan Bedard

Message:

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.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/RuntimeApplicationChecks.mm (modified) (1 diff)
• Tools/BuildSlaveSupport/built-product-archive (modified) (1 diff)
• Tools/BuildSlaveSupport/kill-old-processes (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/LayoutTestRelay (deleted)
• Tools/Makefile (modified) (1 diff)
• Tools/Scripts/build-layouttestrelay (deleted)
• Tools/Scripts/build-webkit (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2017-02-10  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm

@@ -179 +179 @@
 bool IOSApplication::isDumpRenderTree()
 {
-    // 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.
+    // 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.
     static bool isDumpRenderTree = applicationBundleIsEqualTo("org.webkit.DumpRenderTree"); // e.g. org.webkit.DumpRenderTree0
     return isDumpRenderTree;

trunk/Tools/BuildSlaveSupport/built-product-archive

@@ -166 +166 @@
     assert platform in ('mac', 'win', 'gtk', 'efl', 'ios')
 
-    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'):
+    # 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'):
         return createZip(_configurationBuildDirectory, configuration, embedParentDirectoryNameOnDarwin=True)
     elif platform == 'win':

trunk/Tools/BuildSlaveSupport/kill-old-processes

@@ -91 +91 @@
         # FIXME: Consider moving iOS-specific tasks to their own list.
         "Simulator",
-        "LayoutTestRelay"
     ]
 

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2017-02-10  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Tools/Makefile

@@ -7 +7 @@
         ifneq (,$(findstring iphone,$(SDKROOT)))
                 MODULES += MobileMiniBrowser
-        endif
-        ifeq (,$(DO_NOT_BUILD_LAYOUT_TEST_RELAY))
-                MODULES += LayoutTestRelay
         endif
 endif

trunk/Tools/Scripts/build-webkit

@@ -201 +201 @@
         print(join(" ", @copyLibrariesArgs) . "\n");
         (system(@copyLibrariesArgs) == 0) or die;
-
-        if (willUseIOSSimulatorSDK()) {
-            (system("perl", "Tools/Scripts/build-layouttestrelay", argumentsForConfiguration()) == 0) or die;
-        }
     }