From 913f4767e75ae5d7c6687e81eb54894562b5173d Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sat, 12 Mar 2022 08:28:28 +0100 Subject: [PATCH 1/2] Run test scripts in meson CI The autofoo build is on its way out and I am too lazy to properly integrate these scripts with the meson build. Thus, this commit just adds them to one single CI build. At least those that can relatively easily be made to work. The others are left as comments. Signed-off-by: Uli Schlachter --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a80f39a35..7fa840856 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -213,6 +213,19 @@ fedora meson build: - 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") + - (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") + - ninja -C builddir install artifacts: expire_in: "7 days" From 1dc945863b97f111995c14d4f40ecb99e1b141e7 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sat, 12 Mar 2022 14:31:16 +0100 Subject: [PATCH 2/2] Fix complaints from check-preprocessor-syntax.sh Checking that public header files #include "cairo.h" first (or none) Checking that private header files #include "some cairo header" first (or none) Checking that source files #include "cairoint.h" first (or none) ./win32/cairo-dwrite-font-public.c:#include "cairo-win32-private.h" Checking that there is no #include ./win32/cairo-dwrite-font-public.c: * #include Checking that feature conditionals are used with #if only (not #ifdef) This adds a missing cairoint.h include and makes check-preprocessor-syntax.sh slightly better in not warning about includes in C comments. Signed-off-by: Uli Schlachter --- src/check-preprocessor-syntax.sh | 2 +- src/win32/cairo-dwrite-font-public.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/check-preprocessor-syntax.sh b/src/check-preprocessor-syntax.sh index b718f604e..fa0fa715f 100755 --- a/src/check-preprocessor-syntax.sh +++ b/src/check-preprocessor-syntax.sh @@ -49,7 +49,7 @@ grep . >&2 && stat=1 echo 'Checking that there is no #include ' -grep '#.*\.*<.*cairo' $ALL >&2 && stat=1 +grep '^[^*]#.*\.*<.*cairo' $ALL >&2 && stat=1 echo 'Checking that feature conditionals are used with #if only (not #ifdef)' diff --git a/src/win32/cairo-dwrite-font-public.c b/src/win32/cairo-dwrite-font-public.c index 9e4e56ba8..09eddd51d 100644 --- a/src/win32/cairo-dwrite-font-public.c +++ b/src/win32/cairo-dwrite-font-public.c @@ -39,6 +39,7 @@ * with this .c wrapper containing the gtkdocs for cairo-dwrite-font.cpp. */ +#include "cairoint.h" #include "cairo-win32-private.h" /**