[PATCH] gdi32/tests: Enable the otmMacLineGap tests

Huw Davies huw at codeweavers.com
Tue Dec 19 04:05:37 CST 2017


On Mon, Dec 18, 2017 at 08:31:05PM -0700, Alex Henrie wrote:
> Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
> ---
>  dlls/gdi32/tests/font.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
> index bd04a8b6b1..b732cde854 100644
> --- a/dlls/gdi32/tests/font.c
> +++ b/dlls/gdi32/tests/font.c
> @@ -1790,17 +1790,18 @@ static void test_GetKerningPairs(void)
>             kd[i].otmMacDescent, otm.otmMacDescent);
>          ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n",
>             kd[i].otmMacAscent, otm.otmMacAscent);
> -todo_wine {
> +todo_wine
>          ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n",
>             kd[i].otmsCapEmHeight, otm.otmsCapEmHeight);
> +todo_wine
>          ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n",
>             kd[i].otmsXHeight, otm.otmsXHeight);
> -        /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */
> -        if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n",
> +todo_wine_if(kd[i].otmMacLineGap)
> +        ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n",
>             kd[i].otmMacLineGap, otm.otmMacLineGap);
> +todo_wine
>          ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n",
>             kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM);
> -}
>  

This causes a test failure for me.  It turns out that the
otmMacLineGap value should come from the hhea table - I've sent in a
patch that implements this.

Huw.



More information about the wine-devel mailing list