Changeset 197227 in webkit

Timestamp:

Feb 26, 2016, 6:53:44 PM (11 years ago)

Author:

ap@apple.com

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/image_diff.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-02-26  Alexey Proskuryakov  <ap@apple.com>
+
+        [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  <cdumez@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/image_diff.py

@@ -118 +118 @@
 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)