Changeset 264950 in webkit


Ignore:
Timestamp:
Jul 27, 2020 3:40:42 PM (4 years ago)
Author:
Ryan Haddad
Message:

Add test expectations and baselines for iOS 14
https://bugs.webkit.org/show_bug.cgi?id=214709

Reviewed by Jonathan Bedard.

Tools:

Change current version to 14 and update unit tests.

  • Scripts/webkitpy/port/ios.py:

(IOSPort):

  • Scripts/webkitpy/port/ios_device_unittest.py:
  • Scripts/webkitpy/port/ios_simulator_unittest.py:

(IOSSimulatorTest.make_port):
(IOSSimulatorTest.test_layout_test_searchpath_with_apple_additions):
(IOSSimulatorTest.test_layout_test_searchpath_without_apple_additions):
(IOSSimulatorTest.test_layout_searchpath_wih_device_type):

  • Scripts/webkitpy/port/ios_testcase.py:

(IOSTest.make_port):

LayoutTests:

  • platform/ios-13/TestExpectations: Added.
  • platform/ios-13/fast/backgrounds/body-generated-image-propagated-to-root-expected.txt: Added.
  • platform/ios-13/fast/forms/input-double-click-selection-gap-bug-expected.txt: Added.
  • platform/ios-13/fast/forms/slider-thumb-shared-style-expected.txt: Added.
  • platform/ios-13/fast/inline/br-text-decoration-expected.txt: Added.
  • platform/ios-13/fast/layers/inline-dirty-z-order-lists-expected.txt: Added.
  • platform/ios-13/fast/replaced/percent-height-in-anonymous-block-widget-expected.txt: Added.
  • platform/ios-13/fast/text/international/bidi-LDB-2-CSS-expected.txt: Added.
  • platform/ios-13/fast/text/international/bidi-LDB-2-HTML-expected.txt: Added.
  • platform/ios-13/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt: Added.
  • platform/ios-13/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: Copied from LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt.
  • platform/ios-13/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-method.any-expected.txt: Added.
  • platform/ios-13/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-method.any.worker-expected.txt: Added.
  • platform/ios-13/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002-expected.txt: Added.
  • platform/ios-13/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002-expected.txt: Added.
  • platform/ios-13/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt: Copied from LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt.
  • platform/ios-13/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt: Added.
  • platform/ios-13/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt: Added.
  • platform/ios-13/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt: Copied from LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt.
  • platform/ios-13/platform/TestExpectations: Added.
  • platform/ios-13/platform/ios/ios/fast/text/opticalFont-expected.txt: Copied from LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFont-expected.txt.
  • platform/ios-13/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt: Copied from LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt.
  • platform/ios-13/platform/ios/ios/fast/text/opticalFontWithWeight-expected.txt: Copied from LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFontWithWeight-expected.txt.
  • platform/ios/TestExpectations:
  • platform/ios/http/tests/xmlhttprequest/methods-async-expected.txt: Added.
  • platform/ios/http/tests/xmlhttprequest/methods-expected.txt: Added.
  • platform/ios/http/tests/xmlhttprequest/workers/methods-async-expected.txt: Added.
  • platform/ios/http/tests/xmlhttprequest/workers/methods-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
  • platform/ios/imported/w3c/web-platform-tests/encoding/eof-shift_jis-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-method.any-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-method.any.worker-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/mathml/relations/css-styling/ignored-properties-001-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt:
  • platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt: Added.
  • platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt:
  • platform/ios/platform/ios/ios/fast/text/opticalFont-expected.txt:
  • platform/ios/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt:
  • platform/ios/platform/ios/ios/fast/text/opticalFontWithWeight-expected.txt:
  • platform/ipad-13/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt: Copied from LayoutTests/platform/ipad/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt.
  • platform/ipad/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt:
  • platform/mac/imported/w3c/web-platform-tests/encoding/eof-shift_jis-expected.txt: Added.
Location:
trunk
Files:
72 added
14 edited
7 copied

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r264943 r264950  
     12020-07-24  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Add test expectations and baselines for iOS 14
     4        https://bugs.webkit.org/show_bug.cgi?id=214709
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        * platform/ios-13/TestExpectations: Added.
     9        * platform/ios-13/fast/backgrounds/body-generated-image-propagated-to-root-expected.txt: Added.
     10        * platform/ios-13/fast/forms/input-double-click-selection-gap-bug-expected.txt: Added.
     11        * platform/ios-13/fast/forms/slider-thumb-shared-style-expected.txt: Added.
     12        * platform/ios-13/fast/inline/br-text-decoration-expected.txt: Added.
     13        * platform/ios-13/fast/layers/inline-dirty-z-order-lists-expected.txt: Added.
     14        * platform/ios-13/fast/replaced/percent-height-in-anonymous-block-widget-expected.txt: Added.
     15        * platform/ios-13/fast/text/international/bidi-LDB-2-CSS-expected.txt: Added.
     16        * platform/ios-13/fast/text/international/bidi-LDB-2-HTML-expected.txt: Added.
     17        * platform/ios-13/fast/text/international/bidi-LDB-2-formatting-characters-expected.txt: Added.
     18        * platform/ios-13/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: Copied from LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt.
     19        * platform/ios-13/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-method.any-expected.txt: Added.
     20        * platform/ios-13/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-method.any.worker-expected.txt: Added.
     21        * platform/ios-13/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002-expected.txt: Added.
     22        * platform/ios-13/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002-expected.txt: Added.
     23        * platform/ios-13/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt: Copied from LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt.
     24        * platform/ios-13/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt: Added.
     25        * platform/ios-13/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt: Added.
     26        * platform/ios-13/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt: Copied from LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt.
     27        * platform/ios-13/platform/TestExpectations: Added.
     28        * platform/ios-13/platform/ios/ios/fast/text/opticalFont-expected.txt: Copied from LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFont-expected.txt.
     29        * platform/ios-13/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt: Copied from LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt.
     30        * platform/ios-13/platform/ios/ios/fast/text/opticalFontWithWeight-expected.txt: Copied from LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFontWithWeight-expected.txt.
     31        * platform/ios/TestExpectations:
     32        * platform/ios/http/tests/xmlhttprequest/methods-async-expected.txt: Added.
     33        * platform/ios/http/tests/xmlhttprequest/methods-expected.txt: Added.
     34        * platform/ios/http/tests/xmlhttprequest/workers/methods-async-expected.txt: Added.
     35        * platform/ios/http/tests/xmlhttprequest/workers/methods-expected.txt: Added.
     36        * platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     37        * platform/ios/imported/w3c/web-platform-tests/encoding/eof-shift_jis-expected.txt: Added.
     38        * platform/ios/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-method.any-expected.txt: Added.
     39        * platform/ios/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-method.any.worker-expected.txt: Added.
     40        * platform/ios/imported/w3c/web-platform-tests/mathml/relations/css-styling/ignored-properties-001-expected.txt: Added.
     41        * platform/ios/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002-expected.txt: Added.
     42        * platform/ios/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002-expected.txt: Added.
     43        * platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt:
     44        * platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt: Added.
     45        * platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt: Added.
     46        * platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt:
     47        * platform/ios/platform/ios/ios/fast/text/opticalFont-expected.txt:
     48        * platform/ios/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt:
     49        * platform/ios/platform/ios/ios/fast/text/opticalFontWithWeight-expected.txt:
     50        * platform/ipad-13/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt: Copied from LayoutTests/platform/ipad/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt.
     51        * platform/ipad/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt:
     52        * platform/mac/imported/w3c/web-platform-tests/encoding/eof-shift_jis-expected.txt: Added.
     53
    1542020-07-27  Chris Dumez  <cdumez@apple.com>
    255
  • trunk/LayoutTests/platform/ios/TestExpectations

    r264936 r264950  
    34323432
    34333433# Certain versions of iOS use different text security characters.
    3434 webkit.org/b/209692 platform/ios/fast/text/text-security-disc-bullet-pua-ios-new.html [ ImageOnlyFailure ]
     3434webkit.org/b/209692 platform/ios/fast/text/text-security-disc-bullet-pua-ios-new.html [ Pass ]
     3435webkit.org/b/209692 platform/ios/fast/text/text-security-disc-bullet-pua-ios-old.html [ ImageOnlyFailure ]
    34353436webkit.org/b/209692 fast/text/text-security-disc-bullet-pua.html [ ImageOnlyFailure ]
    34363437
     
    34733474
    34743475fast/text/selection-is-prevent-defaulted.html [ Failure ]
     3476
     3477# <rdar://problem/59636115> REGRESSION: [ iOS & macOS ] two imported/w3c/web-platform-tests/WebCryptoAPI are failing
     3478imported/w3c/web-platform-tests/WebCryptoAPI/import_export/rsa_importKey.https.worker.html [ Failure ]
     3479imported/w3c/web-platform-tests/WebCryptoAPI/import_export/test_rsa_importKey.https.html [ Failure ]
     3480
     3481# <rdar://problem/57029120> Reenable crypto/workers/subtle/rsa-postMessage-worker.html and crypto/subtle/aes-cbc-import-key-wrap-jwk-rsa-key-private.html for iOS
     3482crypto/workers/subtle/rsa-postMessage-worker.html [ Skip ]
     3483crypto/subtle/aes-cbc-import-key-wrap-jwk-rsa-key-private.html [ Skip ]
     3484
     3485# <rdar://problem/63448168> [ macOS iOS  Debug ] media/video-source-moved.html is a super flkay timeout
     3486media/video-source-moved.html [ Pass Timeout ]
     3487
     3488# <rdar://problem/64273358> REGRESSION: [ iOS ] imported/w3c/web-platform-tests/dom/ranges/Range-surroundContents.html is flaky timing out.
     3489imported/w3c/web-platform-tests/dom/ranges/Range-surroundContents.html [ Slow ]
     3490
     3491# <rdar://problem/64546452> [ iOS ] mathml/opentype/munderover-stretch-width.html is flaky failing.
     3492mathml/opentype/munderover-stretch-width.html [ Pass Failure ]
     3493
     3494# <rdar://problem/64701357> REGRESSION: [ iOS wk2 ] webgl/1.0.3/conformance/glsl/functions/glsl-function-sign.html and webgl/1.0.3/conformance/glsl/misc/glsl-function-nodes.html are failing consistently.
     3495webgl/1.0.3/conformance/glsl/functions/glsl-function-sign.html [ Failure ]
     3496webgl/1.0.3/conformance/glsl/misc/glsl-function-nodes.html [ Failure ]
     3497
     3498# <rdar://problem/64816264> [ iOS wk2 ] streams/pipe-to.html is flaky failing.
     3499streams/pipe-to.html [ Pass Failure ]
     3500
     3501# <rdar://problem/63255266> [ iOS wk2 ] animations/suspend-resume-animation-events.html is a flaky failure
     3502animations/suspend-resume-animation-events.html [ Pass Failure ]
     3503
     3504# <rdar://problem/63399079> [ iOS Debug ] imported/w3c/web-platform-tests/xhr/access-control-basic-post-success-no-content-type.htm is a flaky failure
     3505imported/w3c/web-platform-tests/xhr/access-control-basic-post-success-no-content-type.htm [ Pass Failure ]
     3506
     3507# <rdar://problem/64047392> REGRESSION: 5 fast/text/international/system-language/navigator-language/navigator-language tests are contant failures
     3508fast/text/international/system-language/navigator-language/navigator-language-en-US.html [ Failure ]
     3509fast/text/international/system-language/navigator-language/navigator-language-es-ES.html [ Failure ]
     3510fast/text/international/system-language/navigator-language/navigator-language-es-MX.html [ Failure ]
     3511fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html [ Failure ]
     3512fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html [ Failure ]
     3513fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html [ Failure ]
  • trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt

    r263156 r264950  
    363363PASS -webkit-rtl-ordering
    364364PASS -webkit-ruby-position
     365PASS -webkit-tap-highlight-color
    365366PASS -webkit-text-combine
    366367PASS -webkit-text-emphasis-color
  • trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt

    r235354 r264950  
    22PASS XMLHttpRequest: send("") - empty entity body (POST)
    33PASS XMLHttpRequest: send("") - empty entity body (PUT)
    4 FAIL XMLHttpRequest: send("") - empty entity body (HEAD) assert_equals: expected "NO" but got "0"
     4PASS XMLHttpRequest: send("") - empty entity body (HEAD)
    55
  • trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt

    r235354 r264950  
    22PASS No content type (POST)
    33PASS No content type (PUT)
    4 FAIL No content type (HEAD) assert_equals: expected "NO" but got "0"
     4PASS No content type (HEAD)
    55PASS Explicit content type (POST)
    66PASS Explicit content type (PUT)
    7 FAIL Explicit content type (HEAD) assert_equals: expected "NO" but got "0"
     7PASS Explicit content type (HEAD)
    88
  • trunk/LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFont-expected.txt

    r250387 r264950  
    55    RenderBody {BODY} at (8,8) size 784x1173
    66      RenderBlock {DIV} at (0,0) size 784x29
    7         RenderText {#text} at (0,0) size 383x29
    8           text run at (0,0) width 383: "This is a test for -webkit-system-font"
     7        RenderText {#text} at (0,0) size 381x29
     8          text run at (0,0) width 381: "This is a test for -webkit-system-font"
    99      RenderBlock {DIV} at (0,29) size 784x29
    10         RenderText {#text} at (0,0) size 735x29
    11           text run at (0,0) width 735: "This is a test for -apple-system. It should be the same as the line above."
     10        RenderText {#text} at (0,0) size 732x29
     11          text run at (0,0) width 732: "This is a test for -apple-system. It should be the same as the line above."
    1212      RenderBlock {DIV} at (0,58) size 784x74
    13         RenderText {#text} at (0,0) size 678x74
    14           text run at (0,0) width 678: "This is a test for -webkit-system-font, using the 'font'"
    15           text run at (0,37) width 110: "property"
     13        RenderText {#text} at (0,0) size 679x74
     14          text run at (0,0) width 679: "This is a test for -webkit-system-font, using the 'font'"
     15          text run at (0,37) width 109: "property"
    1616      RenderBlock {DIV} at (0,132) size 784x37
    17         RenderText {#text} at (0,0) size 715x37
    18           text run at (0,0) width 715: "This is a test for -apple-system, using the 'font' property"
     17        RenderText {#text} at (0,0) size 717x37
     18          text run at (0,0) width 717: "This is a test for -apple-system, using the 'font' property"
    1919      RenderBlock {DIV} at (0,169) size 784x37
    20         RenderText {#text} at (0,0) size 654x37
    21           text run at (0,0) width 654: "This is a test for system-ui, using the 'font' property"
     20        RenderText {#text} at (0,0) size 655x37
     21          text run at (0,0) width 655: "This is a test for system-ui, using the 'font' property"
    2222      RenderBlock {DIV} at (0,206) size 784x29
    23         RenderInline {B} at (0,0) size 556x29
    24           RenderText {#text} at (0,0) size 556x29
    25             text run at (0,0) width 556: "This is a test for -webkit-system-font in bold form"
     23        RenderInline {B} at (0,0) size 552x29
     24          RenderText {#text} at (0,0) size 552x29
     25            text run at (0,0) width 552: "This is a test for -webkit-system-font in bold form"
    2626      RenderBlock {DIV} at (0,235) size 784x29
    27         RenderInline {I} at (0,0) size 519x29
    28           RenderText {#text} at (0,0) size 519x29
    29             text run at (0,0) width 519: "This is a test for -webkit-system-font in italic form"
     27        RenderInline {I} at (0,0) size 516x29
     28          RenderText {#text} at (0,0) size 516x29
     29            text run at (0,0) width 516: "This is a test for -webkit-system-font in italic form"
    3030      RenderBlock {DIV} at (0,264) size 784x37
    3131        RenderText {#text} at (0,0) size 638x37
    3232          text run at (0,0) width 638: "This is a test for -webkit-system-font at size 30px"
    3333      RenderBlock {DIV} at (0,301) size 784x44
    34         RenderText {#text} at (0,0) size 763x44
    35           text run at (0,0) width 763: "This is a test for -webkit-system-font at size 36px"
     34        RenderText {#text} at (0,0) size 760x44
     35          text run at (0,0) width 760: "This is a test for -webkit-system-font at size 36px"
    3636      RenderBlock {DIV} at (0,345) size 784x102
    37         RenderText {#text} at (0,0) size 783x102
    38           text run at (0,0) width 783: "This is a test for -webkit-system-font at size"
    39           text run at (0,51) width 94: "42px"
     37        RenderText {#text} at (0,0) size 781x102
     38          text run at (0,0) width 781: "This is a test for -webkit-system-font at size"
     39          text run at (0,51) width 92: "42px"
    4040      RenderBlock {DIV} at (0,447) size 784x116
    41         RenderText {#text} at (0,0) size 752x116
    42           text run at (0,0) width 752: "This is a test for -webkit-system-font"
    43           text run at (0,58) width 247: "at size 48px"
     41        RenderText {#text} at (0,0) size 750x116
     42          text run at (0,0) width 750: "This is a test for -webkit-system-font"
     43          text run at (0,58) width 246: "at size 48px"
    4444      RenderBlock {DIV} at (0,563) size 784x132
    4545        RenderText {#text} at (0,0) size 753x132
    4646          text run at (0,0) width 753: "This is a test for -webkit-system-"
    47           text run at (0,66) width 377: "font at size 54px"
     47          text run at (0,66) width 375: "font at size 54px"
    4848      RenderBlock {DIV} at (0,695) size 784x146
    49         RenderText {#text} at (0,0) size 627x146
    50           text run at (0,0) width 625: "This is a test for -webkit-"
    51           text run at (0,73) width 627: "system-font at size 60px"
     49        RenderText {#text} at (0,0) size 626x146
     50          text run at (0,0) width 624: "This is a test for -webkit-"
     51          text run at (0,73) width 626: "system-font at size 60px"
    5252      RenderBlock {DIV} at (0,841) size 784x158
    5353        RenderText {#text} at (0,0) size 687x158
    54           text run at (0,0) width 685: "This is a test for -webkit-"
     54          text run at (0,0) width 684: "This is a test for -webkit-"
    5555          text run at (0,79) width 687: "system-font at size 66px"
    5656      RenderBlock {DIV} at (0,999) size 784x174
    57         RenderText {#text} at (0,0) size 745x174
    58           text run at (0,0) width 745: "This is a test for -webkit-"
    59           text run at (0,87) width 741: "system-font at size 72px"
     57        RenderText {#text} at (0,0) size 744x174
     58          text run at (0,0) width 744: "This is a test for -webkit-"
     59          text run at (0,87) width 738: "system-font at size 72px"
  • trunk/LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt

    r247353 r264950  
    55    RenderBody {BODY} at (8,15) size 784x660
    66      RenderBlock {DIV} at (0,0) size 784x24
    7         RenderText {#text} at (0,1) size 106x22
    8           text run at (0,1) width 106: "H1 / Headline"
     7        RenderText {#text} at (0,1) size 104x22
     8          text run at (0,1) width 104: "H1 / Headline"
    99      RenderBlock {DIV} at (0,39) size 784x39
    10         RenderText {#text} at (0,1) size 133x37
    11           text run at (0,1) width 133: "T0 / Title0"
     10        RenderText {#text} at (0,1) size 132x37
     11          text run at (0,1) width 132: "T0 / Title0"
    1212      RenderBlock {DIV} at (0,93) size 784x33
    13         RenderText {#text} at (0,0) size 108x32
    14           text run at (0,0) width 108: "T1 / Title1"
     13        RenderText {#text} at (0,0) size 106x32
     14          text run at (0,0) width 106: "T1 / Title1"
    1515      RenderBlock {DIV} at (0,141) size 784x27
     16        RenderText {#text} at (0,1) size 88x25
     17          text run at (0,1) width 88: "T2 / Title2"
     18      RenderBlock {DIV} at (0,183) size 784x27
    1619        RenderText {#text} at (0,1) size 89x25
    17           text run at (0,1) width 89: "T2 / Title2"
    18       RenderBlock {DIV} at (0,183) size 784x27
    19         RenderText {#text} at (0,1) size 90x25
    20           text run at (0,1) width 90: "T3 / Title3"
     20          text run at (0,1) width 89: "T3 / Title3"
    2121      RenderBlock {DIV} at (0,225) size 784x50
    22         RenderText {#text} at (0,1) size 188x47
    23           text run at (0,1) width 188: "T4 / Title4"
     22        RenderText {#text} at (0,1) size 183x47
     23          text run at (0,1) width 183: "T4 / Title4"
    2424      RenderBlock {DIV} at (0,290) size 784x24
    25         RenderText {#text} at (0,1) size 706x22
    26           text run at (0,1) width 706: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     25        RenderText {#text} at (0,1) size 703x22
     26          text run at (0,1) width 703: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    2727      RenderBlock {DIV} at (0,329) size 784x26
    28         RenderText {#text} at (0,2) size 736x22
    29           text run at (0,2) width 736: "Tall Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     28        RenderText {#text} at (0,2) size 732x22
     29          text run at (0,2) width 732: "Tall Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    3030      RenderBlock {DIV} at (0,370) size 784x22
    3131        RenderText {#text} at (0,1) size 85x19
     
    3535          text run at (0,1) width 83: "FN / Footnote"
    3636      RenderBlock {DIV} at (0,442) size 784x17
    37         RenderText {#text} at (0,1) size 96x15
    38           text run at (0,1) width 96: "Cap 1 / Caption 1"
     37        RenderText {#text} at (0,1) size 95x15
     38          text run at (0,1) width 95: "Cap 1 / Caption 1"
    3939      RenderBlock {DIV} at (0,474) size 784x14
    4040        RenderText {#text} at (0,0) size 92x14
    4141          text run at (0,0) width 92: "Cap 2 / Caption 2"
    4242      RenderBlock {DIV} at (0,503) size 784x22
    43         RenderText {#text} at (0,0) size 154x22
    44           text run at (0,0) width 154: "Short H1 / Headline"
     43        RenderText {#text} at (0,0) size 153x22
     44          text run at (0,0) width 153: "Short H1 / Headline"
    4545      RenderBlock {DIV} at (0,540) size 784x22
    46         RenderText {#text} at (0,0) size 753x22
    47           text run at (0,0) width 753: "Short Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     46        RenderText {#text} at (0,0) size 749x22
     47          text run at (0,0) width 749: "Short Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    4848      RenderBlock {DIV} at (0,577) size 784x20
    4949        RenderText {#text} at (0,0) size 127x19
  • trunk/LayoutTests/platform/ios/platform/ios/ios/fast/text/opticalFontWithWeight-expected.txt

    r247353 r264950  
    55    RenderBody {BODY} at (8,8) size 784x820
    66      RenderBlock {H2} at (0,0) size 784x24
    7         RenderText {#text} at (0,1) size 119x22
    8           text run at (0,1) width 119: "Normal Weight"
     7        RenderText {#text} at (0,1) size 118x22
     8          text run at (0,1) width 118: "Normal Weight"
    99      RenderBlock {P} at (0,40) size 784x20
    1010        RenderText {#text} at (0,0) size 670x20
    1111          text run at (0,0) width 670: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    1212      RenderBlock {H2} at (0,76) size 784x24
    13         RenderText {#text} at (0,1) size 91x22
    14           text run at (0,1) width 91: "100 Weight"
     13        RenderText {#text} at (0,1) size 90x22
     14          text run at (0,1) width 90: "100 Weight"
    1515      RenderBlock {P} at (0,116) size 784x20
    16         RenderText {#text} at (0,0) size 635x20
    17           text run at (0,0) width 635: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     16        RenderText {#text} at (0,0) size 642x20
     17          text run at (0,0) width 642: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    1818      RenderBlock {H2} at (0,152) size 784x24
    1919        RenderText {#text} at (0,1) size 93x22
    2020          text run at (0,1) width 93: "200 Weight"
    2121      RenderBlock {P} at (0,192) size 784x20
    22         RenderText {#text} at (0,0) size 643x20
    23           text run at (0,0) width 643: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     22        RenderText {#text} at (0,0) size 648x20
     23          text run at (0,0) width 648: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    2424      RenderBlock {H2} at (0,228) size 784x24
    2525        RenderText {#text} at (0,1) size 93x22
    2626          text run at (0,1) width 93: "300 Weight"
    2727      RenderBlock {P} at (0,268) size 784x20
    28         RenderText {#text} at (0,0) size 658x20
    29           text run at (0,0) width 658: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     28        RenderText {#text} at (0,0) size 660x20
     29          text run at (0,0) width 660: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    3030      RenderBlock {H2} at (0,304) size 784x24
    31         RenderText {#text} at (0,1) size 94x22
    32           text run at (0,1) width 94: "400 Weight"
     31        RenderText {#text} at (0,1) size 93x22
     32          text run at (0,1) width 93: "400 Weight"
    3333      RenderBlock {P} at (0,344) size 784x20
    3434        RenderText {#text} at (0,0) size 670x20
     
    3838          text run at (0,1) width 93: "500 Weight"
    3939      RenderBlock {P} at (0,420) size 784x20
    40         RenderText {#text} at (0,0) size 686x20
    41           text run at (0,0) width 686: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     40        RenderText {#text} at (0,0) size 687x20
     41          text run at (0,0) width 687: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    4242      RenderBlock {H2} at (0,456) size 784x24
    43         RenderText {#text} at (0,1) size 97x22
    44           text run at (0,1) width 97: "Bold Weight"
     43        RenderText {#text} at (0,1) size 96x22
     44          text run at (0,1) width 96: "Bold Weight"
    4545      RenderBlock {P} at (0,496) size 784x20
    4646        RenderText {#text} at (0,0) size 716x20
    4747          text run at (0,0) width 716: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    4848      RenderBlock {H2} at (0,532) size 784x24
    49         RenderText {#text} at (0,1) size 94x22
    50           text run at (0,1) width 94: "600 Weight"
     49        RenderText {#text} at (0,1) size 93x22
     50          text run at (0,1) width 93: "600 Weight"
    5151      RenderBlock {P} at (0,572) size 784x20
    5252        RenderText {#text} at (0,0) size 699x20
     
    5959          text run at (0,0) width 716: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    6060      RenderBlock {H2} at (0,684) size 784x24
    61         RenderText {#text} at (0,1) size 94x22
    62           text run at (0,1) width 94: "800 Weight"
     61        RenderText {#text} at (0,1) size 93x22
     62          text run at (0,1) width 93: "800 Weight"
    6363      RenderBlock {P} at (0,724) size 784x20
    64         RenderText {#text} at (0,0) size 740x20
    65           text run at (0,0) width 740: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     64        RenderText {#text} at (0,0) size 741x20
     65          text run at (0,0) width 741: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    6666      RenderBlock {H2} at (0,760) size 784x24
    67         RenderText {#text} at (0,1) size 94x22
    68           text run at (0,1) width 94: "900 Weight"
     67        RenderText {#text} at (0,1) size 93x22
     68          text run at (0,1) width 93: "900 Weight"
    6969      RenderBlock {P} at (0,800) size 784x20
    70         RenderText {#text} at (0,0) size 762x20
    71           text run at (0,0) width 762: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     70        RenderText {#text} at (0,0) size 763x20
     71          text run at (0,0) width 763: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
  • trunk/LayoutTests/platform/ipad/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt

    r248017 r264950  
    55    RenderBody {BODY} at (8,15) size 784x668
    66      RenderBlock {DIV} at (0,0) size 784x24
    7         RenderText {#text} at (0,1) size 106x22
    8           text run at (0,1) width 106: "H1 / Headline"
     7        RenderText {#text} at (0,1) size 104x22
     8          text run at (0,1) width 104: "H1 / Headline"
    99      RenderBlock {DIV} at (0,39) size 784x43
    10         RenderText {#text} at (0,0) size 151x42
    11           text run at (0,0) width 151: "T0 / Title0"
     10        RenderText {#text} at (0,0) size 149x42
     11          text run at (0,0) width 149: "T0 / Title0"
    1212      RenderBlock {DIV} at (0,97) size 784x35
    13         RenderText {#text} at (0,0) size 116x34
    14           text run at (0,0) width 116: "T1 / Title1"
     13        RenderText {#text} at (0,0) size 114x34
     14          text run at (0,0) width 114: "T1 / Title1"
    1515      RenderBlock {DIV} at (0,147) size 784x29
    16         RenderText {#text} at (0,1) size 98x27
    17           text run at (0,1) width 98: "T2 / Title2"
     16        RenderText {#text} at (0,1) size 96x27
     17          text run at (0,1) width 96: "T2 / Title2"
    1818      RenderBlock {DIV} at (0,191) size 784x27
    19         RenderText {#text} at (0,1) size 90x25
    20           text run at (0,1) width 90: "T3 / Title3"
     19        RenderText {#text} at (0,1) size 89x25
     20          text run at (0,1) width 89: "T3 / Title3"
    2121      RenderBlock {DIV} at (0,233) size 784x50
    22         RenderText {#text} at (0,1) size 188x47
    23           text run at (0,1) width 188: "T4 / Title4"
     22        RenderText {#text} at (0,1) size 183x47
     23          text run at (0,1) width 183: "T4 / Title4"
    2424      RenderBlock {DIV} at (0,298) size 784x24
    25         RenderText {#text} at (0,1) size 706x22
    26           text run at (0,1) width 706: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     25        RenderText {#text} at (0,1) size 703x22
     26          text run at (0,1) width 703: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    2727      RenderBlock {DIV} at (0,337) size 784x26
    28         RenderText {#text} at (0,2) size 736x22
    29           text run at (0,2) width 736: "Tall Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     28        RenderText {#text} at (0,2) size 732x22
     29          text run at (0,2) width 732: "Tall Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    3030      RenderBlock {DIV} at (0,378) size 784x22
    3131        RenderText {#text} at (0,1) size 85x19
     
    3535          text run at (0,1) width 83: "FN / Footnote"
    3636      RenderBlock {DIV} at (0,450) size 784x17
    37         RenderText {#text} at (0,1) size 96x15
    38           text run at (0,1) width 96: "Cap 1 / Caption 1"
     37        RenderText {#text} at (0,1) size 95x15
     38          text run at (0,1) width 95: "Cap 1 / Caption 1"
    3939      RenderBlock {DIV} at (0,482) size 784x14
    4040        RenderText {#text} at (0,0) size 92x14
    4141          text run at (0,0) width 92: "Cap 2 / Caption 2"
    4242      RenderBlock {DIV} at (0,511) size 784x22
    43         RenderText {#text} at (0,0) size 154x22
    44           text run at (0,0) width 154: "Short H1 / Headline"
     43        RenderText {#text} at (0,0) size 153x22
     44          text run at (0,0) width 153: "Short H1 / Headline"
    4545      RenderBlock {DIV} at (0,548) size 784x22
    46         RenderText {#text} at (0,0) size 753x22
    47           text run at (0,0) width 753: "Short Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
     46        RenderText {#text} at (0,0) size 749x22
     47          text run at (0,0) width 749: "Short Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
    4848      RenderBlock {DIV} at (0,585) size 784x20
    4949        RenderText {#text} at (0,0) size 127x19
  • trunk/Tools/ChangeLog

    r264949 r264950  
     12020-07-23  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Add test expectations and baselines for iOS 14
     4        https://bugs.webkit.org/show_bug.cgi?id=214709
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        Change current version to 14 and update unit tests.
     9
     10        * Scripts/webkitpy/port/ios.py:
     11        (IOSPort):
     12        * Scripts/webkitpy/port/ios_device_unittest.py:
     13        * Scripts/webkitpy/port/ios_simulator_unittest.py:
     14        (IOSSimulatorTest.make_port):
     15        (IOSSimulatorTest.test_layout_test_searchpath_with_apple_additions):
     16        (IOSSimulatorTest.test_layout_test_searchpath_without_apple_additions):
     17        (IOSSimulatorTest.test_layout_searchpath_wih_device_type):
     18        * Scripts/webkitpy/port/ios_testcase.py:
     19        (IOSTest.make_port):
     20
    1212020-07-27  Jonathan Bedard  <jbedard@apple.com>
    222
  • trunk/Tools/Scripts/webkitpy/port/ios.py

    r264425 r264950  
    3737    port_name = "ios"
    3838
    39     CURRENT_VERSION = Version(13)
     39    CURRENT_VERSION = Version(14)
    4040    DEVICE_TYPE = DeviceType(software_variant='iOS')
    4141
  • trunk/Tools/Scripts/webkitpy/port/ios_device_unittest.py

    r264425 r264950  
    9898
    9999        self.assertEqual(search_path, [
    100             '/additional_testing_path/ios-device-add-ios13-wk1',
    101             '/mock-checkout/LayoutTests/platform/ios-device-13-wk1',
    102             '/additional_testing_path/ios-device-add-ios13',
    103             '/mock-checkout/LayoutTests/platform/ios-device-13',
     100            '/additional_testing_path/ios-device-add-ios14-wk1',
     101            '/mock-checkout/LayoutTests/platform/ios-device-14-wk1',
     102            '/additional_testing_path/ios-device-add-ios14',
     103            '/mock-checkout/LayoutTests/platform/ios-device-14',
    104104            '/additional_testing_path/ios-device-wk1',
    105105            '/mock-checkout/LayoutTests/platform/ios-device-wk1',
    106106            '/additional_testing_path/ios-device',
    107107            '/mock-checkout/LayoutTests/platform/ios-device',
    108             '/additional_testing_path/ios-add-ios13-wk1',
    109             '/mock-checkout/LayoutTests/platform/ios-13-wk1',
    110             '/additional_testing_path/ios-add-ios13',
    111             '/mock-checkout/LayoutTests/platform/ios-13',
     108            '/additional_testing_path/ios-add-ios14-wk1',
     109            '/mock-checkout/LayoutTests/platform/ios-14-wk1',
     110            '/additional_testing_path/ios-add-ios14',
     111            '/mock-checkout/LayoutTests/platform/ios-14',
    112112            '/additional_testing_path/ios-wk1',
    113113            '/mock-checkout/LayoutTests/platform/ios-wk1',
     
    117117
    118118    def test_layout_test_searchpath_without_apple_additions(self):
    119         search_path = self.make_port(port_name='ios-device-wk2', os_version=Version(13)).default_baseline_search_path()
     119        search_path = self.make_port(port_name='ios-device-wk2', os_version=Version(14)).default_baseline_search_path()
    120120
    121121        self.assertEqual(search_path, [
    122             '/mock-checkout/LayoutTests/platform/ios-device-13-wk2',
    123             '/mock-checkout/LayoutTests/platform/ios-device-13',
     122            '/mock-checkout/LayoutTests/platform/ios-device-14-wk2',
     123            '/mock-checkout/LayoutTests/platform/ios-device-14',
    124124            '/mock-checkout/LayoutTests/platform/ios-device-wk2',
    125125            '/mock-checkout/LayoutTests/platform/ios-device',
    126             '/mock-checkout/LayoutTests/platform/ios-13-wk2',
    127             '/mock-checkout/LayoutTests/platform/ios-13',
     126            '/mock-checkout/LayoutTests/platform/ios-14-wk2',
     127            '/mock-checkout/LayoutTests/platform/ios-14',
    128128            '/mock-checkout/LayoutTests/platform/ios-wk2',
    129129            '/mock-checkout/LayoutTests/platform/ios',
     
    132132
    133133    def test_layout_searchpath_wih_device_type(self):
    134         search_path = self.make_port(port_name='ios-device-wk2', os_version=Version(13)).default_baseline_search_path(DeviceType.from_string('iPhone SE'))
     134        search_path = self.make_port(port_name='ios-device-wk2', os_version=Version(14)).default_baseline_search_path(DeviceType.from_string('iPhone SE'))
    135135
    136136        self.assertEqual(search_path, [
    137             '/mock-checkout/LayoutTests/platform/iphone-se-device-13-wk2',
    138             '/mock-checkout/LayoutTests/platform/iphone-se-device-13',
     137            '/mock-checkout/LayoutTests/platform/iphone-se-device-14-wk2',
     138            '/mock-checkout/LayoutTests/platform/iphone-se-device-14',
    139139            '/mock-checkout/LayoutTests/platform/iphone-se-device-wk2',
    140140            '/mock-checkout/LayoutTests/platform/iphone-se-device',
    141             '/mock-checkout/LayoutTests/platform/iphone-device-13-wk2',
    142             '/mock-checkout/LayoutTests/platform/iphone-device-13',
     141            '/mock-checkout/LayoutTests/platform/iphone-device-14-wk2',
     142            '/mock-checkout/LayoutTests/platform/iphone-device-14',
    143143            '/mock-checkout/LayoutTests/platform/iphone-device-wk2',
    144144            '/mock-checkout/LayoutTests/platform/iphone-device',
    145             '/mock-checkout/LayoutTests/platform/ios-device-13-wk2',
    146             '/mock-checkout/LayoutTests/platform/ios-device-13',
     145            '/mock-checkout/LayoutTests/platform/ios-device-14-wk2',
     146            '/mock-checkout/LayoutTests/platform/ios-device-14',
    147147            '/mock-checkout/LayoutTests/platform/ios-device-wk2',
    148148            '/mock-checkout/LayoutTests/platform/ios-device',
    149             '/mock-checkout/LayoutTests/platform/iphone-se-13-wk2',
    150             '/mock-checkout/LayoutTests/platform/iphone-se-13',
     149            '/mock-checkout/LayoutTests/platform/iphone-se-14-wk2',
     150            '/mock-checkout/LayoutTests/platform/iphone-se-14',
    151151            '/mock-checkout/LayoutTests/platform/iphone-se-wk2',
    152152            '/mock-checkout/LayoutTests/platform/iphone-se',
    153             '/mock-checkout/LayoutTests/platform/iphone-13-wk2',
    154             '/mock-checkout/LayoutTests/platform/iphone-13',
     153            '/mock-checkout/LayoutTests/platform/iphone-14-wk2',
     154            '/mock-checkout/LayoutTests/platform/iphone-14',
    155155            '/mock-checkout/LayoutTests/platform/iphone-wk2',
    156156            '/mock-checkout/LayoutTests/platform/iphone',
    157             '/mock-checkout/LayoutTests/platform/ios-13-wk2',
    158             '/mock-checkout/LayoutTests/platform/ios-13',
     157            '/mock-checkout/LayoutTests/platform/ios-14-wk2',
     158            '/mock-checkout/LayoutTests/platform/ios-14',
    159159            '/mock-checkout/LayoutTests/platform/ios-wk2',
    160160            '/mock-checkout/LayoutTests/platform/ios',
  • trunk/Tools/Scripts/webkitpy/port/ios_simulator_unittest.py

    r264425 r264950  
    4040    port_maker = IOSSimulatorPort
    4141
    42     def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=Version(13), **kwargs):
     42    def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=Version(14), **kwargs):
    4343        port = super(IOSSimulatorTest, self).make_port(host=host, port_name=port_name, options=options, os_name=os_name, os_version=os_version, kwargs=kwargs)
    4444        port.set_option('child_processes', 1)
     
    9797
    9898        self.assertEqual(search_path, [
    99             '/additional_testing_path/ios-simulator-add-ios13-wk1',
    100             '/mock-checkout/LayoutTests/platform/ios-simulator-13-wk1',
    101             '/additional_testing_path/ios-simulator-add-ios13',
    102             '/mock-checkout/LayoutTests/platform/ios-simulator-13',
     99            '/additional_testing_path/ios-simulator-add-ios14-wk1',
     100            '/mock-checkout/LayoutTests/platform/ios-simulator-14-wk1',
     101            '/additional_testing_path/ios-simulator-add-ios14',
     102            '/mock-checkout/LayoutTests/platform/ios-simulator-14',
    103103            '/additional_testing_path/ios-simulator-wk1',
    104104            '/mock-checkout/LayoutTests/platform/ios-simulator-wk1',
    105105            '/additional_testing_path/ios-simulator',
    106106            '/mock-checkout/LayoutTests/platform/ios-simulator',
    107             '/additional_testing_path/ios-add-ios13-wk1',
    108             '/mock-checkout/LayoutTests/platform/ios-13-wk1',
    109             '/additional_testing_path/ios-add-ios13',
    110             '/mock-checkout/LayoutTests/platform/ios-13',
     107            '/additional_testing_path/ios-add-ios14-wk1',
     108            '/mock-checkout/LayoutTests/platform/ios-14-wk1',
     109            '/additional_testing_path/ios-add-ios14',
     110            '/mock-checkout/LayoutTests/platform/ios-14',
    111111            '/additional_testing_path/ios-wk1',
    112112            '/mock-checkout/LayoutTests/platform/ios-wk1',
     
    116116
    117117    def test_layout_test_searchpath_without_apple_additions(self):
    118         search_path = self.make_port(port_name='ios-simulator-wk2', os_version=Version(13)).default_baseline_search_path()
     118        search_path = self.make_port(port_name='ios-simulator-wk2', os_version=Version(14)).default_baseline_search_path()
    119119
    120120        self.assertEqual(search_path, [
    121             '/mock-checkout/LayoutTests/platform/ios-simulator-13-wk2',
    122             '/mock-checkout/LayoutTests/platform/ios-simulator-13',
     121            '/mock-checkout/LayoutTests/platform/ios-simulator-14-wk2',
     122            '/mock-checkout/LayoutTests/platform/ios-simulator-14',
    123123            '/mock-checkout/LayoutTests/platform/ios-simulator-wk2',
    124124            '/mock-checkout/LayoutTests/platform/ios-simulator',
    125             '/mock-checkout/LayoutTests/platform/ios-13-wk2',
    126             '/mock-checkout/LayoutTests/platform/ios-13',
     125            '/mock-checkout/LayoutTests/platform/ios-14-wk2',
     126            '/mock-checkout/LayoutTests/platform/ios-14',
    127127            '/mock-checkout/LayoutTests/platform/ios-wk2',
    128128            '/mock-checkout/LayoutTests/platform/ios',
     
    131131
    132132    def test_layout_searchpath_wih_device_type(self):
    133         search_path = self.make_port(port_name='ios-simulator-wk2', os_version=Version(13)).default_baseline_search_path(DeviceType.from_string('iPhone SE'))
     133        search_path = self.make_port(port_name='ios-simulator-wk2', os_version=Version(14)).default_baseline_search_path(DeviceType.from_string('iPhone SE'))
    134134
    135135        self.assertEqual(search_path, [
    136             '/mock-checkout/LayoutTests/platform/iphone-se-simulator-13-wk2',
    137             '/mock-checkout/LayoutTests/platform/iphone-se-simulator-13',
     136            '/mock-checkout/LayoutTests/platform/iphone-se-simulator-14-wk2',
     137            '/mock-checkout/LayoutTests/platform/iphone-se-simulator-14',
    138138            '/mock-checkout/LayoutTests/platform/iphone-se-simulator-wk2',
    139139            '/mock-checkout/LayoutTests/platform/iphone-se-simulator',
    140             '/mock-checkout/LayoutTests/platform/iphone-simulator-13-wk2',
    141             '/mock-checkout/LayoutTests/platform/iphone-simulator-13',
     140            '/mock-checkout/LayoutTests/platform/iphone-simulator-14-wk2',
     141            '/mock-checkout/LayoutTests/platform/iphone-simulator-14',
    142142            '/mock-checkout/LayoutTests/platform/iphone-simulator-wk2',
    143143            '/mock-checkout/LayoutTests/platform/iphone-simulator',
    144             '/mock-checkout/LayoutTests/platform/ios-simulator-13-wk2',
    145             '/mock-checkout/LayoutTests/platform/ios-simulator-13',
     144            '/mock-checkout/LayoutTests/platform/ios-simulator-14-wk2',
     145            '/mock-checkout/LayoutTests/platform/ios-simulator-14',
    146146            '/mock-checkout/LayoutTests/platform/ios-simulator-wk2',
    147147            '/mock-checkout/LayoutTests/platform/ios-simulator',
    148             '/mock-checkout/LayoutTests/platform/iphone-se-13-wk2',
    149             '/mock-checkout/LayoutTests/platform/iphone-se-13',
     148            '/mock-checkout/LayoutTests/platform/iphone-se-14-wk2',
     149            '/mock-checkout/LayoutTests/platform/iphone-se-14',
    150150            '/mock-checkout/LayoutTests/platform/iphone-se-wk2',
    151151            '/mock-checkout/LayoutTests/platform/iphone-se',
    152             '/mock-checkout/LayoutTests/platform/iphone-13-wk2',
    153             '/mock-checkout/LayoutTests/platform/iphone-13',
     152            '/mock-checkout/LayoutTests/platform/iphone-14-wk2',
     153            '/mock-checkout/LayoutTests/platform/iphone-14',
    154154            '/mock-checkout/LayoutTests/platform/iphone-wk2',
    155155            '/mock-checkout/LayoutTests/platform/iphone',
    156             '/mock-checkout/LayoutTests/platform/ios-13-wk2',
    157             '/mock-checkout/LayoutTests/platform/ios-13',
     156            '/mock-checkout/LayoutTests/platform/ios-14-wk2',
     157            '/mock-checkout/LayoutTests/platform/ios-14',
    158158            '/mock-checkout/LayoutTests/platform/ios-wk2',
    159159            '/mock-checkout/LayoutTests/platform/ios',
  • trunk/Tools/Scripts/webkitpy/port/ios_testcase.py

    r264425 r264950  
    2929    disable_setup = True
    3030
    31     def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=Version(13), **kwargs):
     31    def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=Version(14), **kwargs):
    3232        port = super(IOSTest, self).make_port(host=host, port_name=port_name, options=options, os_name=os_name, os_version=None, kwargs=kwargs)
    3333        port.set_option('version', str(os_version))
Note: See TracChangeset for help on using the changeset viewer.