diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-11-14 02:19:27 -0600 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-11-14 02:46:16 -0600 |
| commit | 9056fb00b05528b49d3f6a83ea89f0ce0bfb0312 (patch) | |
| tree | dbda2008a56df9675c02d619c179c27ff424c36a | |
| parent | 0503ecaf84391f1d170fd8fd48ba7970d63f1afb (diff) | |
| download | mutter-wip/3v1n0/run-tests-in-ci.tar.gz | |
gitlab-ci: run tests toowip/3v1n0/run-tests-in-ci
| -rw-r--r-- | .gitlab-ci.yml | 37 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 3 | ||||
| -rw-r--r-- | clutter/tests/conform/meson.build | 1 |
3 files changed, 40 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df15a050d..ff8fe1adf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,10 +2,45 @@ image: registry.gitlab.gnome.org/gnome/mutter/master:v1 stages: - build + - test build-mutter: stage: build script: - - meson . build -Degl_device=true -Dwayland_eglstream=true + - meson . build -Degl_device=true -Dwayland_eglstream=true -Dheadless_tests=enabled - ninja -C build - ninja -C build install + - meson test -v -C build --suite headless + # artifacts: + # paths: + # - build + +# test-cogl: +# stage: test +# dependencies: +# - build-mutter +# artifacts: +# paths: +# - build +# script: +# - meson test -v -C build --suite cogl-headless + +# test-clutter: +# stage: test +# dependencies: +# - build-mutter +# artifacts: +# paths: +# - build +# script: +# - meson test -v -C build --suite clutter-headless + +# test-mutter: +# stage: test +# dependencies: +# - build-mutter +# artifacts: +# paths: +# - build +# script: +# - meson test -v -C build --suite mutter-headless diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index eba733c79..541707912 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -7,5 +7,8 @@ RUN dnf -y update && dnf -y upgrade && \ # Until Fedora catches up with meson build-deps dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \ +# To enable testing headless + dnf install -y xorg-x11-server-Xvfb && \ + dnf install -y intltool redhat-rpm-config make && \ dnf clean all diff --git a/clutter/tests/conform/meson.build b/clutter/tests/conform/meson.build index 8355187bf..a9b6a947a 100644 --- a/clutter/tests/conform/meson.build +++ b/clutter/tests/conform/meson.build @@ -89,6 +89,7 @@ foreach test : clutter_conform_tests suite: ['clutter-headless', 'clutter-headless/conform', 'headless'], env: test_env, is_parallel: false, + timeout: 60, ) endif endforeach |