1202419 - Ahem.ttf missing in reftests submitted to W3C

Status: RESOLVED FIXED

(Testing :: Reftest, defect)

Description

[Simon Sapin (:SimonSapin)]

Attachment: Include-Ahem.ttf-in-w3c-css-reftest-export.patch

Some files in layout/reftests/w3c-css/submitted reference layout/reftests/fonts/Ahem.ttf, which is not copied over to the W3C CSS test repository. (Some tests currently fail in Servo because of this.)

Since the W3C CSS test suite build system which copies files around (e.g. combining files from css-variables-1/ and vendor-imports/mozilla/mozilla-central-reftests/variables/ into dist/css-variables-1_dev/), I suggest adding more copies of Ahem.ttf in spec-specific directories.

The attached patch is generated by git, but I don’t know if Mercurial can import the "GIT binary patch" format. The two binary files are copies of layout/reftests/fonts/Ahem.ttf.

Comment 1

[Simon Sapin (:SimonSapin)]

I’ve optimistically applied this in the W3C repository: https://github.com/w3c/csswg-test/pull/848

Comment 2

[Simon Sapin (:SimonSapin)]

Please let me know how if I need to reformat the patch (with binary files) so that Mercurial can read it.

Comment 3

[Carsten Book [:Tomcat]]

(In reply to Simon Sapin (:SimonSapin) from comment #2)
> Please let me know how if I need to reformat the patch (with binary files)
> so that Mercurial can read it.

Hey Simon, yeah can you change this to a mercurial format, this would be awesome!

Comment 4

[Simon Sapin (:SimonSapin)]

Attachment: Include_Ahem.ttf_in_reftests_submitted_to_W3C.patch

It turns out that Mercurial uses the same format for binary patches as git but here it is anyway, this time with a proper commit message.

Comment 5

[Carsten Book [:Tomcat]]

Hey Simon,

this patch has problems to apply to mozilla-inbound cleanly:

patching file layout/reftests/w3c-css/submitted/variables/support/external-variable-font-face.css
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file layout/reftests/w3c-css/submitted/variables/support/external-variable-font-face.css.rej
patching file layout/reftests/w3c-css/submitted/variables/variable-font-face-01.html
Hunk #1 FAILED at 6
1 out of 1 hunks FAILED -- saving rejects to file layout/reftests/w3c-css/submitted/variables/variable-font-face-01.html.rej
patching file layout/reftests/w3c-css/submitted/variables/variable-font-face-02.html
Hunk #1 FAILED at 8
1 out of 1 hunks FAILED -- saving rejects to file layout/reftests/w3c-css/submitted/variables/variable-font-face-02.html.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
errors during apply, please fix and refresh Include_Ahem.ttf_in_reftests_submitted_to_W3C.patch

could you take a look ? thanks!

Comment 6

[Simon Sapin (:SimonSapin)]

Attachment: Include_Ahem.ttf_in_reftests_submitted_to_W3C_2.patch

I’m a bit surprised since `hg rebase` had no trouble with this, but here it is.

It a patch application considered "not clean" whenever any line in the context has changed?

Comment 7

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4281bd4ca5d8

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/4281bd4ca5d8