Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (215701 => 215702)
--- trunk/Tools/BuildSlaveSupport/built-product-archive 2017-04-24 23:43:24 UTC (rev 215701)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2017-04-24 23:44:58 UTC (rev 215702)
@@ -34,6 +34,7 @@
_configurationBuildDirectory = None
_topLevelBuildDirectory = None
+_hostBuildDirectory = None
def main():
@@ -84,8 +85,14 @@
def determineWebKitBuildDirectories(platform, fullPlatform, configuration):
global _configurationBuildDirectory
global _topLevelBuildDirectory
+ global _hostBuildDirectory
_configurationBuildDirectory = webkitBuildDirectoryForConfigurationAndPlatform(configuration, platform, fullPlatform)
_topLevelBuildDirectory = webkitBuildDirectoryForConfigurationAndPlatform(configuration, platform, fullPlatform, returnTopLevelDirectory=True)
+ if platform == 'ios':
+ _hostBuildDirectory = webkitBuildDirectoryForConfigurationAndPlatform(configuration, 'mac')
+ else:
+ _hostBuildDirectory = _configurationBuildDirectory
+
return _topLevelBuildDirectory
@@ -165,9 +172,18 @@
def archiveBuiltProduct(configuration, platform, fullPlatform):
assert platform in ('mac', 'win', 'gtk', 'efl', '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'):
+ if platform == 'ios':
+ combinedDirectory = os.path.join(_topLevelBuildDirectory, 'combined-mac-and-ios')
+ removeDirectoryIfExists(combinedDirectory)
+ os.makedirs(combinedDirectory)
+
+ if subprocess.call(['/bin/cp', '-pR', _configurationBuildDirectory, combinedDirectory]):
+ return 1
+ if subprocess.call(['/bin/cp', '-pR', _hostBuildDirectory, combinedDirectory]):
+ return 1
+
+ return createZip(combinedDirectory, configuration):
+ elif platform == 'mac':
return createZip(_configurationBuildDirectory, configuration, embedParentDirectoryNameOnDarwin=True)
elif platform == 'win':
# FIXME: We shouldn't hardcode the assumption of a 32-bit build. See <https://bugs.webkit.org/show_bug.cgi?id=149715>.
Modified: trunk/Tools/ChangeLog (215701 => 215702)
--- trunk/Tools/ChangeLog 2017-04-24 23:43:24 UTC (rev 215701)
+++ trunk/Tools/ChangeLog 2017-04-24 23:44:58 UTC (rev 215702)
@@ -1,3 +1,18 @@
+2017-04-24 Jonathan Bedard <jbed...@apple.com>
+
+ Package ImageDiff built with host SDK
+ https://bugs.webkit.org/show_bug.cgi?id=168944
+ <rdar://problem/30745642>
+
+ Reviewed by David Kilzer.
+
+ iOS Simulator and iOS device should archive the ImageDiff built for the host
+ machine.
+
+ * BuildSlaveSupport/built-product-archive:
+ (determineWebKitBuildDirectories): Add _hostBuildDirectory for iOS.
+ (archiveBuiltProduct): Archive Mac products for iOS so that ImageDiff is included.
+
2017-04-24 Keith Miller <keith_mil...@apple.com>
ThreadMessage API tests failing on release bots
