[gtk/wip/otte/macos-werror: 5/9] ci: Disable -Werror on all subprojects
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/macos-werror: 5/9] ci: Disable -Werror on all subprojects
- Date: Thu, 4 Nov 2021 01:03:21 +0000 (UTC)
commit 12f500bd279f77cb9bc3ef8c55efad5060cb36c1
Author: Benjamin Otte <otte redhat com>
Date: Thu Nov 4 01:41:05 2021 +0100
ci: Disable -Werror on all subprojects
Would be nice if meson had a nicer way of doing this, but...
.gitlab-ci.yml | 3 ++-
.gitlab-ci/run-tests.sh | 11 +++++++++++
testsuite/meson.build | 8 ++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7aab27c19..3891a50e88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ stages:
# Common variables
variables:
- COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false
-Dwayland-protocols:werror=false -Dsysprof:werror=false"
+ COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false
-Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false
-Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false
-Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false"
BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
MESON_TEST_TIMEOUT_MULTIPLIER: 3
@@ -182,6 +182,7 @@ macos:
-Dpixman:tests=disabled
_build
- ninja -C _build
+ - .gitlab-ci/run-tests.sh _build macos
artifacts:
when: always
paths:
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index e68cf5a6c9..798f48ee73 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -62,6 +62,17 @@ case "${backend}" in
kill ${compositor}
;;
+ macos)
+ meson test -C ${builddir} \
+ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+ --print-errorlogs \
+ --setup=${backend} \
+ --suite=gtk \
+ --no-suite=gsk-compare-opengl
+ exit_code=$?
+ ;;
+
+
broadway)
export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
diff --git a/testsuite/meson.build b/testsuite/meson.build
index 10fa16dfbc..753f62325f 100644
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -52,6 +52,14 @@ if os_win32
])
endif
+if macos_enabled
+ add_test_setup ('macos',
+ env: common_env + [
+ 'GDK_BACKEND=macos',
+ 'TEST_OUTPUT_SUBDIR=macos',
+ ])
+endif
+
if broadway_enabled
add_test_setup ('broadway',
env: common_env + [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]