[cairo-commit] 3 commits - test/Makefile.sources test/meson.build

[GitLab Mirror]

 test/Makefile.sources |    4 ++--
 test/meson.build      |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 92fa421261bdb5d4c326c905f040907c1f580d48
Merge: 38a5c6036 848145251
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Feb 14 09:18:27 2021 +0000

    Merge branch 'small-build-system-fixes' into 'master'
    
    Small build system fixes
    
    See merge request cairo/cairo!111

commit 84814525100eef921bfb5fe3b3bd23b30f42b573
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Dec 15 18:59:31 2020 +0100

    test/meson.build: Add missing tests
    
    These are entries that are present in test/Makefile.sources, but are
    missing from test/meson.build.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/test/meson.build b/test/meson.build
index 0e2e23673..9db36df21 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -26,6 +26,7 @@ test_sources = [
   'bilevel-image.c',
   'bug-40410.c',
   'bug-51910.c',
+  'bug-75705.c',
   'bug-84115.c',
   'bug-bo-rectangular.c',
   'bug-bo-collins.c',
@@ -144,7 +145,6 @@ test_sources = [
   'font-face-get-type.c',
   'font-matrix-translation.c',
   'font-options.c',
-  #'font-variations.c',
   'glyph-cache-pressure.c',
   'get-and-set.c',
   'get-clip.c',
@@ -356,6 +356,7 @@ test_sources = [
   'text-glyph-range.c',
   'text-pattern.c',
   'text-rotate.c',
+  'text-subpixel.c',
   'text-transform.c',
   'text-unhinted-metrics.c',
   'text-zero-len.c',
@@ -398,7 +399,10 @@ test_pthread_sources = [
   'pthread-similar.c',
 ]
 
+# Only font-variations.c is ft-specific according to Makefile.sources, the other
+# depend on fontconfig
 test_ft_font_sources = [
+  'font-variations.c',
   'bitmap-font.c',
   'ft-font-create-for-ft-face.c',
   'ft-show-glyphs-positioning.c',
commit 3a77858dbd0295de3cd5d4f40ec98a759af6e9b5
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Dec 15 18:59:10 2020 +0100

    test/Makefile.sources: Use tabs for indentation
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/test/Makefile.sources b/test/Makefile.sources
index 7eb73647f..5d671b2b4 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -416,8 +416,8 @@ gl_surface_test_sources = \
 	gl-surface-source.c
 
 egl_surface_test_sources = \
-       egl-oversized-surface.c \
-       egl-surface-source.c
+	egl-oversized-surface.c \
+	egl-surface-source.c
 
 quartz_surface_test_sources = quartz-surface-source.c