summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorChristoph Reiter <creiter@src.gnome.org>2018-03-20 17:31:38 +0100
committerChristoph Reiter <creiter@src.gnome.org>2018-03-20 17:31:38 +0100
commitfeb7bf2fbef6ed91c805dd70c9dc218fb1458253 (patch)
tree38232cea11cae95551d600bdb2dc99ca7d2e5c36 /.gitlab-ci
parentb83ba41f2d129953572e3ad8d490b4d3e5a7ddf9 (diff)
downloadgtk+-feb7bf2fbef6ed91c805dd70c9dc218fb1458253.tar.gz
gitlab-ci: enable gtk+:gdk tests
xvfb doesn't like C.utf8 and returns XLocaleNotSupported. While (afaik) C.utf8 and C.UTF.8 should be the same thing, and the former is returned by locale -a on Fedora, switch to C.UTF-8 to make xvfb happy. This makes gtk+:gdk tests pass.
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/Dockerfile2
-rwxr-xr-x.gitlab-ci/test-docker.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 2413b81f53..f4c97c99d4 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -70,4 +70,4 @@ RUN useradd -u $HOST_USER_ID -ms /bin/bash user
USER user
WORKDIR /home/user
-ENV LANG C.utf8
+ENV LANG C.UTF-8
diff --git a/.gitlab-ci/test-docker.sh b/.gitlab-ci/test-docker.sh
index dcac0a0c46..48b22d25ca 100755
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -19,6 +19,5 @@ xvfb-run -a -s "-screen 0 1024x768x24" \
meson test \
--print-errorlogs \
--suite=gtk+ \
- --no-suite=gtk+:gdk \
--no-suite=gtk+:gsk \
--no-suite=gtk+:a11y