Title: [197227] trunk/Tools
Revision
197227
Author
[email protected]
Date
2016-02-26 18:53:44 -0800 (Fri, 26 Feb 2016)

Log Message

[iOS Simulator] Reftests don't work
https://bugs.webkit.org/show_bug.cgi?id=154764

Reviewed by Daniel Bates.

* Scripts/webkitpy/port/image_diff.py: (IOSSimulatorImageDiffer._start):
Use simctl instead of sim.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (197226 => 197227)


--- trunk/Tools/ChangeLog	2016-02-27 02:10:29 UTC (rev 197226)
+++ trunk/Tools/ChangeLog	2016-02-27 02:53:44 UTC (rev 197227)
@@ -1,3 +1,13 @@
+2016-02-26  Alexey Proskuryakov  <[email protected]>
+
+        [iOS Simulator] Reftests don't work
+        https://bugs.webkit.org/show_bug.cgi?id=154764
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/webkitpy/port/image_diff.py: (IOSSimulatorImageDiffer._start):
+        Use simctl instead of sim.
+
 2016-02-26  Chris Dumez  <[email protected]>
 
         Add API test coverage for parseHTMLInteger / parseHTMLNonNegativeInteger

Modified: trunk/Tools/Scripts/webkitpy/port/image_diff.py (197226 => 197227)


--- trunk/Tools/Scripts/webkitpy/port/image_diff.py	2016-02-27 02:10:29 UTC (rev 197226)
+++ trunk/Tools/Scripts/webkitpy/port/image_diff.py	2016-02-27 02:53:44 UTC (rev 197227)
@@ -117,7 +117,10 @@
 
 class IOSSimulatorImageDiffer(ImageDiffer):
     def _start(self, tolerance):
-        command = ['xcrun', '-sdk', 'iphonesimulator', 'sim', '--environment=preserve', '--adopt-pid', self._port._path_to_image_diff(), '--tolerance', str(tolerance)]
+        # FIXME: Using "booted" is not 100% correct, we should use a device ID that we created.
+        # FIXME: Is it a problem that ImageDiff and simctl remain separate processes? This code used to pass --adopt-pid to sim tool.
+        # We should probably just build and use a host version of ImageDiff instead of a simulator one to solve both.
+        command = ['xcrun', '-sdk', 'iphonesimulator', 'simctl', 'spawn', 'booted', self._port._path_to_image_diff(), '--tolerance', str(tolerance)]
         environment = self._port.setup_environ_for_server('ImageDiff')
         self._process = self._port._server_process_constructor(self._port, 'ImageDiff', command, environment)
         self._process.start()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to