1652112 - Merge layout/reftests/w3c-css/submitted/shapes1/ into WPT

Status: RESOLVED FIXED

(Core :: Layout: Floats, task)

Description

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

layout/reftests/w3c-css/submitted/shapes1/ is already running under testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/.

So this should be easy to do. We just need to move them to the relevant folders under testing/web-platform/tests/css/css-shapes.

Comment 1

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

Attachment: Bug 1652112 Part 1 - Move shape-outside shape-box reftests into wpt.

Comment 2

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

Attachment: Bug 1652112 Part 2 - Move shape-outside circle reftests into wpt.

Depends on D85014

Comment 3

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

Attachment: Bug 1652112 Part 3 - Move shape-outside ellipse reftests into wpt.

Depends on D85016

Comment 4

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

Attachment: Bug 1652112 Part 4 - Move shape-outside inset reftests into wpt.

Depends on D85017

Comment 5

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

Attachment: Bug 1652112 Part 5 - Move shape-outside polygon reftests into wpt.

Depends on D85018

Comment 6

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

Attachment: Bug 1652112 Part 6 - Move remaining shape-outside reftests to wpt, and delete w3c-css/submitted/shapes1 folder.

Depends on D85019

Comment 7

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

Attachment: Bug 1652112 Part 0 - Delete vendor-imports/mozilla-central-reftests/shapes1/ in wpt.

Delete both the reftests and ini files.

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/8e9afaf71935
Part 0 - Delete vendor-imports/mozilla-central-reftests/shapes1/ in wpt. r=dholbert
https://hg.mozilla.org/integration/autoland/rev/e85fc3dfd5e8
Part 1 - Move shape-outside shape-box reftests into wpt. r=dholbert
https://hg.mozilla.org/integration/autoland/rev/2acfb0c8714b
Part 2 - Move shape-outside circle reftests into wpt. r=dholbert
https://hg.mozilla.org/integration/autoland/rev/9d1096f1ec01
Part 3 - Move shape-outside ellipse reftests into wpt. r=dholbert
https://hg.mozilla.org/integration/autoland/rev/b40c5b238a2a
Part 4 - Move shape-outside inset reftests into wpt. r=dholbert
https://hg.mozilla.org/integration/autoland/rev/c52a8e4fb6bc
Part 5 - Move shape-outside polygon reftests into wpt. r=dholbert
https://hg.mozilla.org/integration/autoland/rev/dae9b44b1173
Part 6 - Move remaining shape-outside reftests to wpt, and delete w3c-css/submitted/shapes1 folder. r=dholbert

Comment 9

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Failed to create upstream wpt PR due to merge conflicts. This requires fixup from a wpt sync admin.

Comment 10

[Cristian Brindusan [:cbrindusan]]

https://hg.mozilla.org/mozilla-central/rev/8e9afaf71935
https://hg.mozilla.org/mozilla-central/rev/e85fc3dfd5e8
https://hg.mozilla.org/mozilla-central/rev/2acfb0c8714b
https://hg.mozilla.org/mozilla-central/rev/9d1096f1ec01
https://hg.mozilla.org/mozilla-central/rev/b40c5b238a2a
https://hg.mozilla.org/mozilla-central/rev/c52a8e4fb6bc
https://hg.mozilla.org/mozilla-central/rev/dae9b44b1173

Comment 11

[Ting-Yu Lin [:TYLin] (PDT, UTC-7)]

Hi James, The bot fails to upstream my patches. What can I do to help resolving the conflicts?

Comment 12

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

WPT sync for the vendor-imports part is in #25395.

Comment 13

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Created web-platform-tests PR https://github.com/web-platform-tests/wpt/pull/25424 for changes under testing/web-platform/tests

Comment 14

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Upstream PR merged by moz-wptsync-bot