Switch CI tests from autotools to meson

The autotools build files are on their way out (See !298). As
preparation for dropping the autotools build, this commit switches CI to
run tests based on the meson build instead of the autotools one.

No functional changes intended.

Signed-off-by: Uli Schlachter <psychon@znc.in>

1 files changed, 40 insertions, 31 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3374b1cc4..a0df1ec31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,11 +112,11 @@ fedora autotools build:
     paths:
       - "*"
 
-.test fedora autotools:
+.test fedora meson:
   dependencies:
-    - 'fedora autotools build'
+    - 'fedora meson build'
   needs:
-    - 'fedora autotools build'
+    - 'fedora meson build'
   extends:
     - '.fdo.distribution-image@fedora'
     - '.ccache_setup'
@@ -133,59 +133,65 @@ fedora autotools build:
       - "test/**/*.cs"
       - "test/**/*.trace"
 
-test fedora autotools pdf:
-  extends: '.test fedora autotools'
+test fedora meson pdf:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_IGNORE_pdf_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-pdf-argb32.txt)
     - export CAIRO_TEST_IGNORE_pdf_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-pdf-rgb24.txt)
     - export CAIRO_TEST_TARGET=pdf
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora autotools ps2:
-  extends: '.test fedora autotools'
+test fedora meson ps2:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_IGNORE_ps2_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-ps2-argb32.txt)
     - export CAIRO_TEST_IGNORE_ps2_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-ps2-rgb24.txt)
     - export CAIRO_TEST_TARGET=ps2
     - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_PS_FAILURES=1
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora autotools ps3:
-  extends: '.test fedora autotools'
+test fedora meson ps3:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_IGNORE_ps3_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-ps3-argb32.txt)
     - export CAIRO_TEST_IGNORE_ps3_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-ps3-rgb24.txt)
     - export CAIRO_TEST_TARGET=ps3
     - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_PS_FAILURES=1
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora autotools script:
-  extends: '.test fedora autotools'
+test fedora meson script:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_UGLY_HACK_TO_SOMETIMES_IGNORE_SCRIPT_XCB_HUGE_IMAGE_SHM=1
     - export CAIRO_TEST_IGNORE_script_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-script-argb32.txt)
     - export CAIRO_TEST_TARGET=script
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora autotools image:
-  extends: '.test fedora autotools'
+test fedora meson image:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_IGNORE_image_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-image-argb32.txt)
     - export CAIRO_TEST_IGNORE_image_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-image-rgb24.txt)
     - export CAIRO_TEST_IGNORE_image16_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-image16-rgb24.txt)
     - export CAIRO_TEST_TARGET=image,image16
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora autotools recording:
-  extends: '.test fedora autotools'
+test fedora meson recording:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_IGNORE_recording_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-recording-argb32.txt)
     - export CAIRO_TEST_IGNORE_recording_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-recording-rgb24.txt)
     - export CAIRO_TEST_TARGET=recording
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora autotools svg:
-  extends: '.test fedora autotools'
+test fedora meson svg:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_IGNORE_svg11_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-svg11-argb32.txt)
     - export CAIRO_TEST_IGNORE_svg11_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-svg11-rgb24.txt)
@@ -194,10 +200,11 @@ test fedora autotools svg:
     - export CAIRO_BOILERPLATE_DO_NOT_CRASH_ON_ANY2PPM_ERROR=1
     - export ANY2PPM="timeout 3m ./any2ppm"
     - ulimit -S -s 131072
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora autotools xcb:
-  extends: '.test fedora autotools'
+test fedora meson xcb:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_IGNORE_xcb_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-argb32.txt)
     - export CAIRO_TEST_IGNORE_xcb_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-rgb24.txt)
@@ -207,10 +214,11 @@ test fedora autotools xcb:
     - export CAIRO_TEST_IGNORE_xcb_render_0_0_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-render-0-0-rgb24.txt)
     - export CAIRO_TEST_IGNORE_xcb_fallback_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-fallback-rgb24.txt)
     - export CAIRO_TEST_TARGET="xcb,xcb-window,xcb-window&,xcb-render-0_0,xcb-fallback"
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora autotools xlib:
-  extends: '.test fedora autotools'
+test fedora meson xlib:
+  extends: '.test fedora meson'
   script:
     - export CAIRO_TEST_IGNORE_xlib_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-argb32.txt)
     - export CAIRO_TEST_IGNORE_xlib_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-rgb24.txt)
@@ -218,7 +226,8 @@ test fedora autotools xlib:
     - export CAIRO_TEST_IGNORE_xlib_render_0_0_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-render-0-0-rgb24.txt)
     - export CAIRO_TEST_IGNORE_xlib_fallback_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-fallback-rgb24.txt)
     - export CAIRO_TEST_TARGET="xlib,xlib-window,xlib-render-0_0,xlib-fallback"
-    - xvfb-run make check V=1 VERBOSE=1
+    - export srcdir=../../test
+    - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
 fedora meson build:
   extends:
@@ -252,7 +261,7 @@ fedora meson build:
     expire_in: "7 days"
     when: "always"
     paths:
-      - 'builddir/meson-logs/'
+      - "*"
 
 meson mingw-32 build:
   extends: