[cairo-commit] 3 commits - .gitlab-ci.yml src/check-preprocessor-syntax.sh src/win32

[GitLab Mirror]

 .gitlab-ci.yml                       |   13 +++++++++++++
 src/check-preprocessor-syntax.sh     |    2 +-
 src/win32/cairo-dwrite-font-public.c |    1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit da5450e7292091acd9dabc1600fb651467261a3b
Merge: 74f2da7b7 1dc945863
Author: Uli Schlachter <psychon at znc.in>
Date:   Thu Jul 14 16:59:27 2022 +0000

    Merge branch 'run-check-scripts-in-ci' into 'master'
    
    Run test scripts in meson CI
    
    See merge request cairo/cairo!299

commit 1dc945863b97f111995c14d4f40ecb99e1b141e7
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Mar 12 14:31:16 2022 +0100

    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 <cairo.*.h>
    ./win32/cairo-dwrite-font-public.c: * #include <cairo-win32.h>
    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 <psychon at znc.in>

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 <cairo.*.h>'
-grep '#.*\<include\>.*<.*cairo' $ALL >&2 && stat=1
+grep '^[^*]#.*\<include\>.*<.*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"
 
 /**
commit 913f4767e75ae5d7c6687e81eb54894562b5173d
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Mar 12 08:28:28 2022 +0100

    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 <psychon at znc.in>

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"