Merge branch 'use-meson-test-for-scripts' into 'master'

CI: Invoke several of the test scripts via `meson test`

See merge request cairo/cairo!345

.gitlab-ci.yml

@@ -212,16 +212,16 @@ fedora meson build:
     - export CFLAGS="-Werror -Wno-error=deprecated-declarations"
     - meson builddir ${MESON_ARGS}
     - ninja -C builddir
-    # - ninja -C builddir test
 
     # Run test scripts
     #- (cd builddir/src && srcdir=../../src bash "$srcdir/check-def.sh")   This script calls "make cairo.def" and thus does not work with meson
     - mkdir builddir/src/.libs
     - touch builddir/src/.libs/libfoo.so
-    - MAKE=echo CAIRO_HAS_HIDDEN_SYMBOLS=1 bash src/check-plt.sh builddir/src/libcairo.so
-    - (cd src && bash "check-headers.sh")
-    - (cd src && bash "check-preprocessor-syntax.sh")
-    - (cd src && bash "check-doc-syntax.sh")
+    # Run all the tests, except for the big test executable which
+    # gets run separately
+    - meson test -C builddir --no-suite=slow
+
+    # TODO: These aren't set up as Meson tests yet
     - (cd doc/public && bash "check-doc-syntax.sh")
     # FIXME: The following line really needs gtk-doc to run first
     - (cd doc/public && DOC_MODULE=cairo bash "check-doc-coverage.sh")

src/meson.build

@@ -307,6 +307,7 @@ if shell.found()
   foreach test_script: test_scripts
     test(test_script, shell,
       args: [test_script],
+      suite: ['fast', 'lint'],
       workdir: meson.current_source_dir())
   endforeach
 
@@ -316,6 +317,7 @@ if shell.found()
   test('check-plt.sh', shell,
     args: ['check-plt.sh', libcairo ],
     env: env,
+    suite: ['fast', 'plt'],
     workdir: meson.current_source_dir())
 
 endif

test/meson.build

@@ -648,5 +648,6 @@ env.set('srcdir', meson.current_source_dir())
 test('cairo', exe,
   timeout: 60 * 60,
   env: env,
+  suite: ['cairo-test-suite', 'slow'],
   workdir: meson.current_build_dir(),
   depends: test_depends)