diff options
| -rwxr-xr-x | .gitlab-ci/test-docker-autotools.sh | 3 | ||||
| -rw-r--r-- | Makefile.am | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/.gitlab-ci/test-docker-autotools.sh b/.gitlab-ci/test-docker-autotools.sh index c685cc05a9..5564a9e254 100755 --- a/.gitlab-ci/test-docker-autotools.sh +++ b/.gitlab-ci/test-docker-autotools.sh @@ -31,5 +31,6 @@ make -j${N_PROCS} if [ -n "${DO_DISTCHECK-}" ]; then make -j${N_PROCS} check SKIP_GDKTARGET="echo Not actually running tests for now" - make -j${N_PROCS} distcheck SKIP_GDKTARGET="echo Not actually running tests for now" + xvfb-run -a -s "-screen 0 1024x768x24" \ + make -j${N_PROCS} distcheck SKIP_GDKTARGET="echo Not actually running tests for now" fi diff --git a/Makefile.am b/Makefile.am index 8c2a97ad37..c5952e731d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -121,4 +121,18 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ GITIGNORE_TRANSLATION_DIRS = po-properties GITIGNOREFILES = po-properties/gtk30-properties.pot +distcheck-hook: distcheck-hook-meson +distcheck-hook-meson: + set -e; if command -v meson > /dev/null; then \ + cd $(distdir); \ + meson setup _build/meson; \ + meson compile -C _build/meson -v; \ + meson test -C _build/meson \ + --timeout-multiplier 4 \ + --print-errorlogs \ + --suite=gtk+-3.0 \ + --no-suite=gtk+-3.0:a11y; \ + rm -fr _build/meson; \ + fi + -include $(top_srcdir)/git.mk |