Closed Bug 1652112 Opened 1 year ago Closed 1 year ago

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

Categories

(Core :: Layout: Floats, task)

task

Tracking

()

RESOLVED FIXED
82 Branch
Tracking Status
firefox82 --- fixed

People

(Reporter: TYLin, Assigned: TYLin)

References

Details

Attachments

(7 files)

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.

Attachment #9166328 - Attachment description: Bug 1652112 Part 1 - Move shape-outside shape-box reftests into wpt. r=dbaron → Bug 1652112 Part 1 - Move shape-outside shape-box reftests into wpt.
Attachment #9166330 - Attachment description: Bug 1652112 Part 2 - Move shape-outside circle reftests into wpt. r=dbaron → Bug 1652112 Part 2 - Move shape-outside circle reftests into wpt.
Attachment #9166331 - Attachment description: Bug 1652112 Part 3 - Move shape-outside ellipse reftests into wpt. r=dbaron → Bug 1652112 Part 3 - Move shape-outside ellipse reftests into wpt.
Attachment #9166332 - Attachment description: Bug 1652112 Part 4 - Move shape-outside inset reftests into wpt. r=dbaron → Bug 1652112 Part 4 - Move shape-outside inset reftests into wpt.
Attachment #9166333 - Attachment description: Bug 1652112 Part 5 - Move shape-outside polygon reftests into wpt. r=dbaron → Bug 1652112 Part 5 - Move shape-outside polygon reftests into wpt.
Attachment #9166334 - Attachment description: Bug 1652112 Part 6 - Move remaining shape-outside reftests to wpt, and delete w3c-css/submitted/shapes1 folder. r=dbaron → Bug 1652112 Part 6 - Move remaining shape-outside reftests to wpt, and delete w3c-css/submitted/shapes1 folder.
Pushed by aethanyc@gmail.com:
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
Failed to create upstream wpt PR due to merge conflicts. This requires fixup from a wpt sync admin.

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

Flags: needinfo?(james)

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

Created web-platform-tests PR https://github.com/web-platform-tests/wpt/pull/25424 for changes under testing/web-platform/tests
Flags: needinfo?(james)
Upstream PR merged by moz-wptsync-bot
You need to log in before you can comment on or make changes to this bug.