diff options
| author | Keith Packard <keithp@keithp.com> | 2020-04-03 17:57:43 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-04-13 15:28:07 -0700 |
| commit | 55e9fceffc45bb4cbbeabe8fd45028f50caec906 (patch) | |
| tree | b14f06f8a386f16db0a5c18cbeabf92c3052e71f /do_tests.c | |
| parent | 95a84fd5584873885f3123f25b6424008409afc1 (diff) | |
Fix core AA text tests which now fail due to change in fontconfig
Xft can no longer support 'render' in font names due to a
change in fontconfig. Work around this by removing that from
the font names and apply it to the pattern manually whenever
the 'bfont' name is not NULL.
Signed-off-by: Keith Packard <keithp@keithp.com>
Part-of: <https://gitlab.freedesktop.org/xorg/test/x11perf/-/merge_requests/1>
Diffstat (limited to 'do_tests.c')
| -rw-r--r-- | do_tests.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1047,39 +1047,39 @@ Test test[] = { {"-caa10text", "Char in 80-char aa core line (DejaVu Sans 10)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {80, 10, "DejaVu Sans:antialias=true:render=false:rgba=0:pixelsize=10", NULL}}, + {80, 10, "DejaVu Sans:antialias=true:rgba=0:pixelsize=10", "render=false"}}, {"-caa24text", "Char in 30-char aa core line (DejaVu Sans 24)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {30, 24, "DejaVu Sans:antialias=true:render=false:rgba=0:pixelsize=24", NULL}}, + {30, 24, "DejaVu Sans:antialias=true:rgba=0:pixelsize=24", "render=false"}}, {"-caaftext", "Char in 80-char aa core line (Courier 12)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {80, 12, "Courier:antialias=true:render=false:rgba=0:pixelsize=12", NULL}}, + {80, 12, "Courier:antialias=true:rgba=0:pixelsize=12", "render=false"}}, {"-ca10text", "Char in 80-char a core line (DejaVu Sans 10)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {80, 10, "DejaVu Sans:antialias=false:render=false:rgba=0:pixelsize=10", NULL}}, + {80, 10, "DejaVu Sans:antialias=false:rgba=0:pixelsize=10", "render=false"}}, {"-ca24text", "Char in 30-char a core line (DejaVu Sans 24)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {30, 24, "DejaVu Sans:antialias=false:render=false:rgba=0:pixelsize=24", NULL}}, + {30, 24, "DejaVu Sans:antialias=false:rgba=0:pixelsize=24", "render=false"}}, {"-caftext", "Char in 80-char a core line (Courier 12)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {80, 12, "Courier:antialias=false:render=false:rgba=0:pixelsize=12", NULL}}, + {80, 12, "Courier:antialias=false:rgba=0:pixelsize=12", "render=false"}}, {"-crgb10text", "Char in 80-char rgb core line (DejaVu Sans 10)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {80, 10, "DejaVu Sans:antialias=true:render=false:rgba=rgb:pixelsize=10", NULL}}, + {80, 10, "DejaVu Sans:antialias=true:rgba=rgb:pixelsize=10", "render=false"}}, {"-crgb24text", "Char in 30-char rgb core line (DejaVu Sans 24)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {30, 24, "DejaVu Sans:antialias=true:render=false:rgba=rgb:pixelsize=24", NULL}}, + {30, 24, "DejaVu Sans:antialias=true:rgba=rgb:pixelsize=24", "render=false"}}, {"-crgbftext", "Char in 80-char rgb core line (Courier 12)", NULL, InitAAText, DoAAText, ClearTextWin, EndAAText, V1_5FEATURE, NONROP, 0, - {80, 12, "Courier:antialias=true:render=false:rgba=rgb:pixelsize=12", NULL}}, + {80, 12, "Courier:antialias=true:rgba=rgb:pixelsize=12", "render=false"}}, #endif {"-scroll10", "Scroll 10x10 pixels", NULL, InitScroll, DoScroll, MidScroll, EndScroll, |