<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[265846] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/265846">265846</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2020-08-18 19:34:53 -0700 (Tue, 18 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[run-webkit-tests] Rosetta specific test expectations
https://bugs.webkit.org/show_bug.cgi?id=215633
<rdar://problem/67353771>

Reviewed by Darin Adler.

Tools:

* Scripts/webkitpy/port/mac.py:
(MacPort.expectations_dict): Add special case for Rosetta expectations.
* Scripts/webkitpy/port/mac_unittest.py:
(MacTest.test_rosetta_expectations):

LayoutTests:

* platform/mac/TestExpectations: Move Rosetta expectations.
* platform/mac/TestExpectationsRosetta: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmacpy">trunk/Tools/Scripts/webkitpy/port/mac.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmac_unittestpy">trunk/Tools/Scripts/webkitpy/port/mac_unittest.py</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacTestExpectationsRosetta">trunk/LayoutTests/platform/mac/TestExpectationsRosetta</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (265845 => 265846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2020-08-19 02:24:53 UTC (rev 265845)
+++ trunk/LayoutTests/ChangeLog 2020-08-19 02:34:53 UTC (rev 265846)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2020-08-18  Jonathan Bedard  <jbedard@apple.com>
+
+        [run-webkit-tests] Rosetta specific test expectations
+        https://bugs.webkit.org/show_bug.cgi?id=215633
+        <rdar://problem/67353771>
+
+        Reviewed by Darin Adler.
+
+        * platform/mac/TestExpectations: Move Rosetta expectations.
+        * platform/mac/TestExpectationsRosetta: Added.
+
</ins><span class="cx"> 2020-08-18  Andres Gonzalez  <andresg_22@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix for accessibility/mac/aria-expanded-notifications.html in isolated tree mode.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (265845 => 265846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations  2020-08-19 02:24:53 UTC (rev 265845)
+++ trunk/LayoutTests/platform/mac/TestExpectations     2020-08-19 02:34:53 UTC (rev 265846)
</span><span class="lines">@@ -2200,20 +2200,6 @@
</span><span class="cx"> [ arm64 ] imported/w3c/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.1.html [ Failure ]
</span><span class="cx"> [ arm64 ] imported/w3c/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.3.html [ Failure ]
</span><span class="cx"> 
</span><del>-# rdar://67281310 ([ Rosetta Layout Tests ] REGRESSION (r265639): [ GoldenGate ] 11 canvas layout tests are a constant failure)
-# FIXME: Should skip this only on Rosetta, not all Intel Big Sur Macs
-[ x86_64 BigSur+ ] canvas/philip/tests/2d.line.miter.obtuse.html [ Failure ]
-[ x86_64 BigSur+ ] canvas/philip/tests/2d.path.arc.selfintersect.1.html [ Failure ]
-[ x86_64 BigSur+ ] canvas/philip/tests/2d.path.arc.shape.3.html [ Failure ]
-[ x86_64 BigSur+ ] fast/canvas/canvas-ellipse-zero-lineto.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/canvas/2d.line.miter.obtuse.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/canvas/2d.path.arc.selfintersect.1.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/canvas/2d.path.arc.shape.3.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/web-platform-tests/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.obtuse.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.1.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.3.html [ Failure ]
-
</del><span class="cx"> # rdar://66842535 ([AS Layout Tests] REGRESSION (r265488): fast/text/letter-spacing-shaping.html is a constant ImageOnlyFailure)
</span><span class="cx"> [ arm64 ] fast/text/letter-spacing-shaping.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> 
</span><span class="lines">@@ -2230,11 +2216,4 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/215587 media/modern-media-controls/volume-down-support/volume-down-support.html [ Pass Timeout ]
</span><span class="cx"> 
</span><del>-# rdar://67289434 ([ Rosetta Layout Tests ] REGRESSION (r265701): [ BigSur ] 3 webaudio/the-audio-api/the-audioparam-interface tests are a constant failure)
-# FIXME: Should skip this only on Rosetta, not all Intel Big Sur Macs
-[ x86_64 BigSur+ ] imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner-connections.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner.html [ Failure ]
-[ x86_64 BigSur+ ] imported/w3c/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-basic.html [ Failure ]
-
-
</del><span class="cx"> webkit.org/b/215614 media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-rtl.html [ Pass Timeout ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectationsRosetta"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/TestExpectationsRosetta (0 => 265846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectationsRosetta                           (rev 0)
+++ trunk/LayoutTests/platform/mac/TestExpectationsRosetta      2020-08-19 02:34:53 UTC (rev 265846)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+# FIXME: This is a work-around for Rosetta, remove once <https://bugs.webkit.org/show_bug.cgi?id=213761> is resolved
+
+# rdar://67281310 ([ Rosetta Layout Tests ] REGRESSION (r265639): [ GoldenGate ] 11 canvas layout tests are a constant failure)
+[ BigSur+ ] canvas/philip/tests/2d.line.miter.obtuse.html [ Failure ]
+[ BigSur+ ] canvas/philip/tests/2d.path.arc.selfintersect.1.html [ Failure ]
+[ BigSur+ ] canvas/philip/tests/2d.path.arc.shape.3.html [ Failure ]
+[ BigSur+ ] fast/canvas/canvas-ellipse-zero-lineto.html [ Failure ]
+[ BigSur+ ] imported/w3c/canvas/2d.line.miter.obtuse.html [ Failure ]
+[ BigSur+ ] imported/w3c/canvas/2d.path.arc.selfintersect.1.html [ Failure ]
+[ BigSur+ ] imported/w3c/canvas/2d.path.arc.shape.3.html [ Failure ]
+[ BigSur+ ] imported/w3c/web-platform-tests/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html [ Failure ]
+[ BigSur+ ] imported/w3c/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.obtuse.html [ Failure ]
+[ BigSur+ ] imported/w3c/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.1.html [ Failure ]
+[ BigSur+ ] imported/w3c/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.3.html [ Failure ]
+
+# rdar://67289434 ([ Rosetta Layout Tests ] REGRESSION (r265701): [ BigSur ] 3 webaudio/the-audio-api/the-audioparam-interface tests are a constant failure)
+[ BigSur+ ] imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner-connections.html [ Failure ]
+[ BigSur+ ] imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner.html [ Failure ]
+[ BigSur+ ] imported/w3c/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-basic.html [ Failure ]
+
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (265845 => 265846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-08-19 02:24:53 UTC (rev 265845)
+++ trunk/Tools/ChangeLog       2020-08-19 02:34:53 UTC (rev 265846)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2020-08-18  Jonathan Bedard  <jbedard@apple.com>
+
+        [run-webkit-tests] Rosetta specific test expectations
+        https://bugs.webkit.org/show_bug.cgi?id=215633
+        <rdar://problem/67353771>
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.expectations_dict): Add special case for Rosetta expectations.
+        * Scripts/webkitpy/port/mac_unittest.py:
+        (MacTest.test_rosetta_expectations):
+
</ins><span class="cx"> 2020-08-18  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, contributors.json is broken
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (265845 => 265846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py 2020-08-19 02:24:53 UTC (rev 265845)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py    2020-08-19 02:34:53 UTC (rev 265846)
</span><span class="lines">@@ -73,6 +73,18 @@
</span><span class="cx">             return 'arm64'
</span><span class="cx">         return result
</span><span class="cx"> 
</span><ins>+    # FIXME: This is a work-around for Rosetta, remove once <https://bugs.webkit.org/show_bug.cgi?id=213761> is resolved
+    def expectations_dict(self, device_type=None):
+        result = super(MacPort, self).expectations_dict(device_type=device_type)
+        if self.architecture() == 'x86_64' and self.host.platform.architecture() == 'arm64':
+            rosetta_expectations = self._filesystem.join(self.layout_tests_dir(), 'platform', 'mac', 'TestExpectationsRosetta')
+            if self._filesystem.exists(rosetta_expectations):
+                result[rosetta_expectations] = self._filesystem.read_text_file(rosetta_expectations)
+            else:
+                _log.warning('Failed to find Rosetta special-case expectation path at {}'.format(rosetta_expectations))
+        return result
+
+
</ins><span class="cx">     def _build_driver_flags(self):
</span><span class="cx">         architecture = self.architecture()
</span><span class="cx">         # The Internal SDK should always prefer arm64e binaries to arm64 ones
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmac_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (265845 => 265846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py        2020-08-19 02:24:53 UTC (rev 265845)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py   2020-08-19 02:34:53 UTC (rev 265846)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> from webkitpy.common.system.outputcapture import OutputCapture
</span><span class="cx"> from webkitpy.tool.mocktool import MockOptions
</span><span class="cx"> from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2, ScriptError
</span><ins>+from webkitpy.common.system.platforminfo_mock import MockPlatformInfo
+from webkitpy.common.system.systemhost_mock import MockSystemHost
</ins><span class="cx"> from webkitpy.common.version_name_map import VersionNameMap
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -268,3 +270,19 @@
</span><span class="cx">             ),
</span><span class="cx">             port.configuration_for_upload(),
</span><span class="cx">         )
</span><ins>+
+    def test_rosetta_expectations(self):
+        mock_host = MockSystemHost()
+        mock_host.platform = MockPlatformInfo(architecture='arm64')
+        mock_host.filesystem.write_text_file(
+            '/mock-checkout/LayoutTests/platform/mac/TestExpectationsRosetta',
+            '# FIXME <https://bugs.webkit.org/show_bug.cgi?id=213761>\n',
+        )
+        port = self.make_port(
+            host=mock_host,
+            options=MockOptions(architecture='x86_64', configuration='Release'),
+        )
+        self.assertEqual(
+            list(port.expectations_dict().keys())[-1],
+            '/mock-checkout/LayoutTests/platform/mac/TestExpectationsRosetta',
+        )
</ins></span></pre>
</div>
</div>

</body>
</html>