Changeset 293447 in webkit

Timestamp:

Apr 26, 2022, 2:22:28 PM (2 years ago)

Author:

Simon Fraser

Message:

[ iOS EWS ] css3/background/background-repeat-round-auto2.html is a image failure
​https://bugs.webkit.org/show_bug.cgi?id=238965
<rdar://91454381>

Reviewed by Tim Horton.

Generic shaders can produce slightly different results to optimized shaders, and
get swapped in racily, so disable them for testing on platforms where accelerated
drawing is used.

Tools:

• Scripts/webkitpy/port/base.py:

(Port.port_adjust_environment_for_test_driver):

• Scripts/webkitpy/port/driver.py:

(Driver._setup_environ_for_driver):

• Scripts/webkitpy/port/ios.py:

(IOSPort.test_expectations_file_position):
(IOSPort):
(IOSPort.port_adjust_environment_for_test_driver):

• Scripts/webkitpy/port/mac.py:

(MacPort.port_adjust_environment_for_test_driver):

LayoutTests:

• platform/ios-wk2/TestExpectations:
• platform/ios/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/port/base.py (modified) (1 diff)
• Tools/Scripts/webkitpy/port/driver.py (modified) (1 diff)
• Tools/Scripts/webkitpy/port/ios.py (modified) (1 diff)
• Tools/Scripts/webkitpy/port/mac.py (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-26  Simon Fraser  <simon.fraser@apple.com>
+
+        [ iOS EWS ] css3/background/background-repeat-round-auto2.html is a image failure
+        https://bugs.webkit.org/show_bug.cgi?id=238965
+        <rdar://91454381>
+
+        Reviewed by Tim Horton.
+
+        Generic shaders can produce slightly different results to optimized shaders, and
+        get swapped in racily, so disable them for testing on platforms where accelerated
+        drawing is used.
+
+        * platform/ios-wk2/TestExpectations:
+        * platform/ios/TestExpectations:
+
 2022-04-26  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -2181 +2181 @@
 webkit.org/b/238954 imported/w3c/web-platform-tests/css/selectors/invalidation/user-action-pseudo-classes-in-has.html [ Pass Failure ]
 
-# This failure is only happening on EWS
-webkit.org/b/238965 css3/background/background-repeat-round-auto2.html [ Pass ImageOnlyFailure ]
-
 webkit.org/b/231780 [ Debug ] imported/w3c/web-platform-tests/webrtc/simulcast/basic.https.html [ Pass Failure ]
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -3569 +3569 @@
 webkit.org/b/238771 media/video-played-ranges-1.html [ Pass Failure ]
 
-webkit.org/b/238781 css3/background/background-repeat-round-auto1.html [ Pass ImageOnlyFailure ]
-
 webkit.org/b/237159 imported/w3c/web-platform-tests/css/css-contain/content-visibility/content-visibility-049.html [ Pass Crash ]
 

trunk/Tools/ChangeLog

@@ +1 @@
+2022-04-26  Simon Fraser  <simon.fraser@apple.com>
+
+        [ iOS EWS ] css3/background/background-repeat-round-auto2.html is a image failure
+        https://bugs.webkit.org/show_bug.cgi?id=238965
+        <rdar://91454381>
+
+        Reviewed by Tim Horton.
+
+        Generic shaders can produce slightly different results to optimized shaders, and
+        get swapped in racily, so disable them for testing on platforms where accelerated
+        drawing is used.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.port_adjust_environment_for_test_driver):
+        * Scripts/webkitpy/port/driver.py:
+        (Driver._setup_environ_for_driver):
+        * Scripts/webkitpy/port/ios.py:
+        (IOSPort.test_expectations_file_position):
+        (IOSPort):
+        (IOSPort.port_adjust_environment_for_test_driver):
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.port_adjust_environment_for_test_driver):
+
 2022-04-26  Jonathan Bedard  <jbedard@apple.com>
 

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

@@ -787 +787 @@
             clean_env[name] = os.environ[name]
 
+    def port_adjust_environment_for_test_driver(self, env):
+        return env
+
     def setup_environ_for_server(self, server_name=None):
         # We intentionally copy only a subset of os.environ when

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

@@ -438 +438 @@
         self._append_environment_variable_path(environment, 'DYLD_FRAMEWORK_PATH', build_root_path)
         self._append_environment_variable_path(environment, '__XPC_DYLD_FRAMEWORK_PATH', build_root_path)
+
+        self._port.port_adjust_environment_for_test_driver(environment)
+
         # Use an isolated temp directory that can be deleted after testing (especially important on Mac, as
         # CoreMedia disk cache is in the temp directory).

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

@@ -111 +111 @@
     def test_expectations_file_position(self):
         return 5
+
+    def port_adjust_environment_for_test_driver(self, env):
+        env = super(IOSPort, self).port_adjust_environment_for_test_driver(env)
+        env['CA_DISABLE_GENERIC_SHADERS'] = '1'
+        env['__XPC_CA_DISABLE_GENERIC_SHADERS'] = '1'
+        return env

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

@@ -189 +189 @@
         return env
 
+    def port_adjust_environment_for_test_driver(self, env):
+        env = super(MacPort, self).port_adjust_environment_for_test_driver(env)
+        env['CA_DISABLE_GENERIC_SHADERS'] = '1'
+        env['__XPC_CA_DISABLE_GENERIC_SHADERS'] = '1'
+        return env
+
     def _clear_global_caches_and_temporary_files(self):
         self._filesystem.rmtree(os.path.expanduser('~/Library/' + self.driver_name()))