[pango: 3/3] Merge branch 'matthiasc/for-main' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit f9d0b6da8f4ad1a285d462ae381d861738d0ced1
Merge: 60c4f9d5 2d0287de
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Mar 15 02:48:56 2022 +0000

    Merge branch 'matthiasc/for-main' into 'main'
    
    Fix test font configuration
    
    See merge request GNOME/pango!601

 tests/fonts/fonts.conf         |   4 +-
 tests/fontsets/cantarell       |  11 ++
 tests/fontsets/cantarell2      |  11 ++
 tests/fontsets/mono            |  11 ++
 tests/fontsets/mono2           |  11 ++
 tests/layouts/aaa.layout       |  38 +++----
 tests/layouts/tab-crash.layout | 252 ++++++++++++++++++++---------------------
 tests/meson.build              |   9 ++
 tests/test-fonts.c             | 233 +++++++++++++++++++++++++++++++++++++
 9 files changed, 433 insertions(+), 147 deletions(-)
---