xserver: Branch 'server-1.20-branch' - 13 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Feb 25 15:45:56 UTC 2019
.gitlab-ci.yml | 113 +++++++
.gitlab-ci/Dockerfile | 35 ++
.travis.yml | 15 -
present/present_wnmd.c | 4
test/scripts/build-travis-deps.sh | 31 --
test/scripts/run-piglit.sh | 6
test/scripts/xinit-piglit-session.sh | 11
test/tetexec.cfg | 497 -----------------------------------
8 files changed, 146 insertions(+), 566 deletions(-)
New commits:
commit 01a03a476a5f963846fdb7702217be17ac1ecd6c
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:16:36 2019 +0100
present/wnmd: Allow flipping if the window pixmap matches the toplevel's
Instead of testing window->redirectDraw.
With Xwayland, the toplevel window is always redirected, so this would
unnecessarily preclude flipping there in some cases, e.g. with wlroots
based Wayland compositors or with fullscreen X11 windows in weston.
Fixes issue #631.
(Cherry picked from commit a093a88531599832811a1ba5cb85101af91a545e)
diff --git a/present/present_wnmd.c b/present/present_wnmd.c
index a2d9da8fb..9d0b147cc 100644
--- a/present/present_wnmd.c
+++ b/present/present_wnmd.c
@@ -270,8 +270,8 @@ present_wnmd_check_flip(RRCrtcPtr crtc,
if (!screen_priv->wnmd_info->flip)
return FALSE;
- /* Don't flip redirected windows */
- if (window->redirectDraw != RedirectDrawNone)
+ /* Can't flip redirected child windows */
+ if (screen->GetWindowPixmap(window) != screen->GetWindowPixmap(toplvl_window))
return FALSE;
/* Source pixmap must align with window exactly */
commit e5984241ab8d7ca75eb3e5e893d63adb017ed0f5
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:56:23 2019 +0100
gitlab-ci: Add autotools build & test job
(Cherry picked from commit 2f12c8017508f23195db92503435fc3ef183da4b)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 984a93854..3e9df00d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ debian-testing:
set -e
- /kaniko/executor --context $CI_PROJECT_DIR/.gitlab-ci --destination $IMAGE_LOCAL
-build-and-test:
+.common-build-and-test:
stage: build-and-test
image: $IMAGE_LOCAL
artifacts:
@@ -70,8 +70,29 @@ build-and-test:
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
+ - export PATH="/usr/lib/ccache:$PATH"
- ccache --zero-stats
- ccache --show-stats
+ after_script:
+ - CCACHE_DIR="$PWD/ccache" ccache --show-stats
+
+autotools-build-and-test:
+ extends: .common-build-and-test
+ script:
+ - mkdir build/
+ - cd build/
+ - |
+ ../autogen.sh --prefix=/usr
+ make -j$(nproc) install
+ set +e
+ set -x
+ make -j$(nproc) check
+ status=$?
+ cat test/piglit-results/xvfb/long-summary || :
+ exit $status
+
+meson-build-and-test:
+ extends: .common-build-and-test
script:
- meson -Dprefix=/usr build/
- |
@@ -83,5 +104,3 @@ build-and-test:
cat build/meson-logs/testlog.txt
cat build/test/piglit-results/xvfb/long-summary || :
exit $status
- after_script:
- - CCACHE_DIR="$PWD/ccache" ccache --show-stats
commit de6d87b61959cd3997feed3efe25fb2a36e543fb
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:56:01 2019 +0100
gitlab-ci: Use ccache
Meson picks it up automatically.
Based on:
* https://gitlab.freedesktop.org/mesa/mesa/merge_requests/240
* https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/
* https://stackoverflow.com/questions/53659419/ccache-no-hits-in-gitlab-ci
v2 based on the corresponding Mesa change:
* Quote CCACHE_(BASE)DIR environment variables.
* Clear ccache stats in before_script.
* Move cache stanza to the build-and-test job, the cache isn't used in
the docker-image job.
Reviewed-by: Adam Jackson <ajax at redhat.com> # v1
(Cherry picked from commit b577df77451d34e28cfef3bda5031a43caeba90a)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61291371f..984a93854 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,10 +59,19 @@ build-and-test:
when: on_failure
paths:
- build/test/piglit-results/
+ cache:
+ paths:
+ - ccache/
variables:
LC_ALL: C.UTF-8
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
+ before_script:
+ - export CCACHE_BASEDIR="$PWD"
+ - export CCACHE_DIR="$PWD/ccache"
+ - export CCACHE_COMPILERCHECK=content
+ - ccache --zero-stats
+ - ccache --show-stats
script:
- meson -Dprefix=/usr build/
- |
@@ -74,3 +83,5 @@ build-and-test:
cat build/meson-logs/testlog.txt
cat build/test/piglit-results/xvfb/long-summary || :
exit $status
+ after_script:
+ - CCACHE_DIR="$PWD/ccache" ccache --show-stats
commit 37ad8dd978e8d35233e489e771f7dcf3e09c3b7a
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:55:31 2019 +0100
gitlab-ci: Add ccache to docker image, and leave in autotools
We're going to make use of these in build & test jobs.
(Cherry picked from commit 537f06e21ee2c4c88ee062c26555338257e043ef)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c9e09920..61291371f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@
# container registry, so that the image from the main repository's registry
# will be used there as well.
variables:
- IMAGE_TAG: "debian-testing-20181217"
+ IMAGE_TAG: "debian-testing-20190219"
IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
IMAGE_MAIN: "registry.freedesktop.org/xorg/xserver:$IMAGE_TAG"
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index eee6c5b6d..4c66ad0d4 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -12,7 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
chmod +x /usr/sbin/policy-rc.d && \
echo 'deb-src https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/deb-src.list && \
apt-get update && \
- apt-get install -y meson git ca-certificates cmake automake autoconf libtool libwaffle-dev \
+ apt-get install -y meson git ca-certificates ccache cmake automake autoconf libtool libwaffle-dev \
libxkbcommon-dev python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb && \
apt-get build-dep -y xorg-server && \
\
@@ -29,7 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
echo '[xts]' > piglit/piglit.conf && echo 'path=/root/xts' >> piglit/piglit.conf && \
find -name \*.a -o -name \*.o | xargs rm && \
\
- apt-get purge -y git cmake automake autoconf libtool libwaffle-dev libxkbcommon-dev \
+ apt-get purge -y git cmake libwaffle-dev libxkbcommon-dev \
x11-utils x11-xserver-utils xauth xvfb && \
apt-get autoremove -y --purge && apt-get clean && \
rm -f /var/lib/apt/lists/deb.debian.org_debian_dists_testing_*
commit 61eccbcec930efeb1a124cc8edff70e6f65c927e
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:54:57 2019 +0100
gitlab-ci: Don't rely on $CI_PROJECT_NAME
The name of a forked repository can be changed later, in which case this
would fail to refer to the main repository.
Pointed out by Eric Engestrom in
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/224 .
(Cherry picked from commit fede384962edd175b1a2ce6edd8d2ef9b0fd74f0)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2ce64531..3c9e09920 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@
variables:
IMAGE_TAG: "debian-testing-20181217"
IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
- IMAGE_MAIN: "registry.freedesktop.org/xorg/$CI_PROJECT_NAME:$IMAGE_TAG"
+ IMAGE_MAIN: "registry.freedesktop.org/xorg/xserver:$IMAGE_TAG"
stages:
- docker-image
commit e10cfd8fcc395360ce9acd93bfd7503da8e35381
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:54:41 2019 +0100
gitlab-ci: Only run docker-image stage if relevant source files change
Otherwise there's normally no need to run it. It will also run when a
new branch is created, which ensures that the docker image always exists
(e.g. in a newly forked repository).
Inspired by https://gitlab.freedesktop.org/mesa/mesa/merge_requests/143
(Cherry picked from commit 8694395fcfd407190db74f31064960e484747377)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6d1ef5ff..d2ce64531 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,10 @@ stages:
debian-testing:
stage: docker-image
+ only:
+ changes:
+ - .gitlab-ci.yml
+ - .gitlab-ci/Dockerfile
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
commit 7246730edfb4f9079eb0ef1c41c43c47854a7432
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:53:55 2019 +0100
gitlab-ci: Set LC_ALL=C.UTF-8
Although piglit could now handle non-ASCII characters in the
environment, meson was still failing without this (even though it's
using Python 3).
Reviewed-by: Eric Anholt <eric at anholt.net>
(Cherry picked from commit bc6998b728749015bfd93a85fbae48af777c9a34)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 254df9af1..e6d1ef5ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,6 +56,7 @@ build-and-test:
paths:
- build/test/piglit-results/
variables:
+ LC_ALL: C.UTF-8
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
script:
commit 8db5a711da6a0b8f28c885b968b1e6bf2d45ce62
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:53:37 2019 +0100
test: Use .../piglit instead of .../piglit-*.py
The latter use Python 2 and break with any non-ASCII characters in the
environment, the former uses Python 3 and works fine in that case.
Reviewed-by: Eric Anholt <eric at anholt.net>
(Cherry picked from commit 4aaaf69229be574d6d11084225ecd91446a15170)
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index c52736796..eee6c5b6d 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -13,8 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
echo 'deb-src https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/deb-src.list && \
apt-get update && \
apt-get install -y meson git ca-certificates cmake automake autoconf libtool libwaffle-dev \
- libxkbcommon-dev python-mako python-numpy python-six python3-mako python3-numpy python3-six \
- x11-utils x11-xserver-utils xauth xvfb && \
+ libxkbcommon-dev python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb && \
apt-get build-dep -y xorg-server && \
\
cd /root && \
@@ -31,6 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
find -name \*.a -o -name \*.o | xargs rm && \
\
apt-get purge -y git cmake automake autoconf libtool libwaffle-dev libxkbcommon-dev \
- python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb && \
+ x11-utils x11-xserver-utils xauth xvfb && \
apt-get autoremove -y --purge && apt-get clean && \
rm -f /var/lib/apt/lists/deb.debian.org_debian_dists_testing_*
diff --git a/test/scripts/run-piglit.sh b/test/scripts/run-piglit.sh
index b999c2598..8b9fda1a4 100755
--- a/test/scripts/run-piglit.sh
+++ b/test/scripts/run-piglit.sh
@@ -46,8 +46,8 @@ $XSERVER_BUILDDIR/test/simple-xinit \
# Write out piglit-summaries.
SHORT_SUMMARY=$PIGLIT_RESULTS_DIR/summary
LONG_SUMMARY=$PIGLIT_RESULTS_DIR/long-summary
-$PIGLIT_DIR/piglit-summary.py -s $PIGLIT_RESULTS_DIR > $SHORT_SUMMARY
-$PIGLIT_DIR/piglit-summary.py $PIGLIT_RESULTS_DIR > $LONG_SUMMARY
+$PIGLIT_DIR/piglit summary console -s $PIGLIT_RESULTS_DIR > $SHORT_SUMMARY
+$PIGLIT_DIR/piglit summary console $PIGLIT_RESULTS_DIR > $LONG_SUMMARY
# Write the short summary to make check's log file.
cat $SHORT_SUMMARY
@@ -66,7 +66,7 @@ if ! grep "^ *crash: *0$" $SHORT_SUMMARY > /dev/null; then
status=1
fi
-$PIGLIT_DIR/piglit-summary-html.py \
+$PIGLIT_DIR/piglit summary html \
--overwrite \
$PIGLIT_RESULTS_DIR/html \
$PIGLIT_RESULTS_DIR
diff --git a/test/scripts/xinit-piglit-session.sh b/test/scripts/xinit-piglit-session.sh
index b907af0f3..b495c96d6 100755
--- a/test/scripts/xinit-piglit-session.sh
+++ b/test/scripts/xinit-piglit-session.sh
@@ -32,4 +32,4 @@ PIGLIT_ARGS="$PIGLIT_ARGS -x xloadqueryfont at 1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont at 1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont at 2"
-exec ./piglit-run.py xts-render $PIGLIT_ARGS $PIGLIT_RESULTS_DIR
+exec ./piglit run xts-render $PIGLIT_ARGS $PIGLIT_RESULTS_DIR
commit 3314af2d15085118f2ca0d4ce65ae6ec1f38fbad
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:53:12 2019 +0100
gitlab-ci: Docker image can be generated as part of pipeline
This removes the dependency on an externally generated docker image, and
should make it easier to update the docker image or make other changes
related to it.
This is based on Debian testing, because I'm most familiar with Debian.
But it should be easy to base it on another distro.
v2:
* Use kaniko instead of docker-in-docker for image generation, so it can
also work in unprivileged runners.
* Drop piglit.conf & tetexec.cfg overrides, just make sure the files in
the image work.
(Cherry picked from commit f56d8e2282a3d1344aa1300c78faede0071a3bfa)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc970bd25..254df9af1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,56 @@
-image: nwnk/xserver-travis-rawhide:v5
+# IMAGE_TAG is the tag of the docker image used for the build jobs. If the
+# image doesn't exist yet, the docker-image stage generates it.
+#
+# In order to generate a new image, one should generally change the tag.
+# While removing the image from the registry would also work, that's not
+# recommended except for ephemeral images during development: Replacing an
+# image after a significant amount of time might pull in newer versions of
+# gcc/clang or other packages, which might break the build with older commits
+# using the same tag.
+#
+# After merging a change resulting in generating a new image to the main
+# repository, it's recommended to remove the image from the source repository's
+# container registry, so that the image from the main repository's registry
+# will be used there as well.
+variables:
+ IMAGE_TAG: "debian-testing-20181217"
+ IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+ IMAGE_MAIN: "registry.freedesktop.org/xorg/$CI_PROJECT_NAME:$IMAGE_TAG"
-job:
+stages:
+ - docker-image
+ - build-and-test
+
+debian-testing:
+ stage: docker-image
+ image:
+ name: gcr.io/kaniko-project/executor:debug
+ entrypoint: [""]
+ script:
+ - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+ - mkdir kaniko-context
+ - |
+ echo "FROM $IMAGE_LOCAL" > kaniko-context/Dockerfile
+ # If the image exists in the local registry, skip to the build-and-test job
+ set +e
+ set -x
+ /kaniko/executor --context kaniko-context --no-push && exit 0
+ set +x
+ set -e
+ - |
+ echo "FROM $IMAGE_MAIN" > kaniko-context/Dockerfile
+ # Try to re-use the image from the main repository's registry, and if
+ # that fails, generate a local image from scratch
+ set +e
+ set -x
+ /kaniko/executor --context kaniko-context --destination $IMAGE_LOCAL && exit 0
+ set +x
+ set -e
+ - /kaniko/executor --context $CI_PROJECT_DIR/.gitlab-ci --destination $IMAGE_LOCAL
+
+build-and-test:
+ stage: build-and-test
+ image: $IMAGE_LOCAL
artifacts:
when: on_failure
paths:
@@ -9,12 +59,6 @@ job:
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
script:
- - |
- cat > $PIGLIT_DIR/piglit.conf << _EOF_
- [xts]
- path=$XTEST_DIR
- _EOF_
- - cp test/tetexec.cfg $XTEST_DIR/xts5
- meson -Dprefix=/usr build/
- |
ninja -C build/ install
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
new file mode 100644
index 000000000..c52736796
--- /dev/null
+++ b/.gitlab-ci/Dockerfile
@@ -0,0 +1,36 @@
+FROM debian:testing-slim
+
+WORKDIR /tmp
+
+RUN export DEBIAN_FRONTEND=noninteractive; \
+ echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \
+ echo 'path-exclude=/usr/share/locale/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \
+ echo 'path-exclude=/usr/share/man/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \
+ echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf && \
+ echo '#!/bin/sh' > /usr/sbin/policy-rc.d && \
+ echo 'exit 101' >> /usr/sbin/policy-rc.d && \
+ chmod +x /usr/sbin/policy-rc.d && \
+ echo 'deb-src https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/deb-src.list && \
+ apt-get update && \
+ apt-get install -y meson git ca-certificates cmake automake autoconf libtool libwaffle-dev \
+ libxkbcommon-dev python-mako python-numpy python-six python3-mako python3-numpy python3-six \
+ x11-utils x11-xserver-utils xauth xvfb && \
+ apt-get build-dep -y xorg-server && \
+ \
+ cd /root && \
+ git clone https://gitlab.freedesktop.org/mesa/piglit.git && cd piglit && \
+ cmake -G Ninja -DPIGLIT_BUILD_GL_TESTS=OFF -DPIGLIT_BUILD_GLES1_TESTS=OFF \
+ -DPIGLIT_BUILD_GLES2_TESTS=OFF -DPIGLIT_BUILD_GLES3_TESTS=OFF \
+ -DPIGLIT_BUILD_DMA_BUF_TESTS=OFF -DPIGLIT_BUILD_GLX_TESTS=OFF && \
+ ninja && \
+ cd .. && \
+ git clone https://gitlab.freedesktop.org/xorg/test/xts && \
+ cd xts && ./autogen.sh && xvfb-run make -j$(nproc) && \
+ cd .. && rm -rf piglit/.git xts/.git && \
+ echo '[xts]' > piglit/piglit.conf && echo 'path=/root/xts' >> piglit/piglit.conf && \
+ find -name \*.a -o -name \*.o | xargs rm && \
+ \
+ apt-get purge -y git cmake automake autoconf libtool libwaffle-dev libxkbcommon-dev \
+ python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb && \
+ apt-get autoremove -y --purge && apt-get clean && \
+ rm -f /var/lib/apt/lists/deb.debian.org_debian_dists_testing_*
diff --git a/test/scripts/xinit-piglit-session.sh b/test/scripts/xinit-piglit-session.sh
index c26735d49..b907af0f3 100755
--- a/test/scripts/xinit-piglit-session.sh
+++ b/test/scripts/xinit-piglit-session.sh
@@ -24,15 +24,6 @@ fi
cd $PIGLIT_DIR
-# Write the piglit.conf we'll use for our testing. Don't use the
-# default piglit.conf name because that may overwrite a local
-# piglit.conf.
-PIGLITCONF=piglit-xserver-test.conf
-cat <<EOF > $PIGLITCONF
-[xts]
-path=$XTEST_DIR
-EOF
-
# Skip some tests that are failing at the time of importing the script.
# "REPORT: min_bounds, rbearing was 0, expecting 2"
PIGLIT_ARGS="$PIGLIT_ARGS -x xlistfontswithinfo at 3"
@@ -41,4 +32,4 @@ PIGLIT_ARGS="$PIGLIT_ARGS -x xloadqueryfont at 1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont at 1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont at 2"
-exec ./piglit-run.py xts-render -f $PIGLITCONF $PIGLIT_ARGS $PIGLIT_RESULTS_DIR
+exec ./piglit-run.py xts-render $PIGLIT_ARGS $PIGLIT_RESULTS_DIR
diff --git a/test/tetexec.cfg b/test/tetexec.cfg
deleted file mode 100644
index dd919900d..000000000
--- a/test/tetexec.cfg
+++ /dev/null
@@ -1,497 +0,0 @@
-#
-# Copyright (c) 2005 X.Org Foundation L.L.C.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is furnished to do
-# so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# Copyright (c) Applied Testing and Technology, Inc. 1995
-# All Rights Reserved.
-#
-# Project: VSW5
-#
-# File: tetexec.cfg
-#
-# Description:
-# Execute configuration file for VSW5
-#
-# Modifications:
-# $Log: tetexec.cfg,v $
-# Revision 1.2 2005-11-03 08:42:00 jmichael
-# clean up all vsw5 paths to use xts5 instead.
-#
-# Revision 1.1.1.2 2005/04/15 14:05:06 anderson
-# Reimport of the base with the legal name in the copyright fixed.
-#
-# Revision 8.0 1998/12/23 23:39:36 mar
-# Branch point for Release 5.0.2
-#
-# Revision 7.0 1998/10/30 23:02:43 mar
-# Branch point for Release 5.0.2b1
-#
-# Revision 6.0 1998/03/02 05:30:36 tbr
-# Branch point for Release 5.0.1
-#
-# Revision 5.1 1998/02/24 03:36:35 andy
-# Added the XT_COVERAGE variable.
-#
-# Revision 5.0 1998/01/26 03:27:10 tbr
-# Branch point for Release 5.0.1b1
-#
-# Revision 4.2 1998/01/23 00:37:47 tbr
-# Fix XT_FONTSET typo. Add some variable descriptions.
-#
-# Revision 4.1 1998/01/22 05:28:25 tbr
-# req.4.W.00029 vswsr126 vswsr125 vswsr124 vswsr122 vswsr127
-# Added new fonts and modified XT_FONTSET to select those fonts
-# and realigned the data files associated with certain tests
-# to match the expected results when using the new fonts
-#
-# Revision 4.0 1995/12/15 09:26:02 tbr
-# Branch point for Release 5.0.0
-#
-# Revision 3.1 1995/12/15 00:33:13 andy
-# Prepare for GA Release
-#
-
-# Portions of this software are based on Xlib and X Protocol Test Suite.
-# We have used this material under the terms of its copyright, which grants
-# free use, subject to the conditions below. Note however that those
-# portions of this software that are based on the original Test Suite have
-# been significantly revised and that all such revisions are copyright (c)
-# 1995 Applied Testing and Technology, Inc. Insomuch as the proprietary
-# revisions cannot be separated from the freely copyable material, the net
-# result is that use of this software is governed by the ApTest copyright.
-#
-# Copyright (c) 1990, 1991 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not be
-# used in advertising or otherwise to promote the sale, use or other dealings
-# in this Software without prior written authorization from the X Consortium.
-#
-# Copyright 1990, 1991 by UniSoft Group Limited.
-#
-# Permission to use, copy, modify, distribute, and sell this software and
-# its documentation for any purpose is hereby granted without fee,
-# provided that the above copyright notice appear in all copies and that
-# both that copyright notice and this permission notice appear in
-# supporting documentation, and that the name of and UniSoft not be
-# used in advertising or publicity pertaining to distribution of the
-# software without specific, written prior permission. and UniSoft
-# makes no representations about the suitability of this software for any
-# purpose. It is provided "as is" without express or implied warranty.
-#
-# $XConsortium: tetexec.cfg,v 1.27 94/04/17 20:59:59 rws Exp $
-#
-###########################################################################
-# This file contains run-time parameters for the test suite.
-# They are accessed with the tet_getvar() function.
-###########################################################################
-
-##############################################
-# Configuration parameters defined by the TET
-##############################################
-
-# TET_EXEC_IN_PLACE - Setting this variable to False indicates that
-# files will be executed in a temporary execution directory.
-# Use of a temporary execution directory for each test enables
-# parallel execution of the test suite against multiple servers.
-# Setting this variable to True will give you improved performance if
-# you are not attempting parallel execution of the test suite against
-# multiple servers.
-TET_EXEC_IN_PLACE=True
-
-# TET_EXEC_LOCK - Indicate whether file locking should be used. Setting
-# this variable to True means that a "tet_lock" file will be created in
-# the execution directory of the test program. When this file exists,
-# tcc will skip that test.
-TET_EXEC_LOCK=False
-
-# TET_SAVE_FILES - This indicates which files generated during execution of
-# tests are to be saved for later examination.
-# This line should not be altered.
-TET_SAVE_FILES=Err*.err,*.sav
-
-###########################################################
-# General configuration parameters
-###########################################################
-
-# XT_COVERAGE - There are three different levels of coverage that can be
-# tested. They are largely identical but effect a few tests which
-# are in a transitional state in terms of consistency of the specification,
-# test suite, and sample code. The value of this variable determines
-# whether these tests are run, or return results of UNTESTED.
-#
-# 0 - All tests are run. This level is intended for use only by
-# developers of the sample code and the test suite as
-# it enables execution of tests which are under investigation.
-# 1 - All tests which should pass are run. At present this
-# is as of R6.4gamma of the sample code. This value
-# must be used to brand implementations derived from the
-# sample code at this revision or above. Otherwise see value 2.
-# 2 - This value may be used in the branding of implementations
-# which are derived from revisions of the sample code earlier
-# than R6.4gamma.
-#
-# Please see Section 4.1.2 of the User's Guide for additional information.
-XT_COVERAGE=1
-
-# XT_ALT_SCREEN - If the display supports more than one screen then
-# this parameter should be set to one that is not under test.
-# Set to the string UNSUPPORTED if only one screen is available.
-XT_ALT_SCREEN=UNSUPPORTED
-
-# XT_FONTPATH -
-# This should be set to a comma separated list that is a valid font path
-# for the X server.
-# It should include at least the components of the default font path
-# for the X server enabling the cursor font to be accessed.
-# One of the entries in the list must be the directory in which
-# the test fonts were installed.
-XT_FONTPATH=/root/xts/xts5/fonts,catalogue:/etc/X11/fontpath.d,built-ins
-
-# XT_SPEEDFACTOR - Specifies a multiplier used for timing.
-# This should be set >= 1.
-# This is a speedfactor which should be set to reflect the relative delay
-# in response of the underlying operating system and X server combined.
-# Co-operating processes which must synchronize allow a time delay in
-# proportion to this speedfactor, to account for scheduling delays in the
-# underlying operating system and X server.
-# There should be no need to change the default unless the round trip
-# time to the X server can be very long ( >15 seconds); in this case set this
-# parameter to a value larger than the maximum round trip time divided
-# by 3.
-XT_SPEEDFACTOR=1
-
-# XT_RESET_DELAY - Specifies a delay time in seconds.
-# Set this to be a time which is greater than or equal to the maximum time
-# required by your server to reset when the last client is closed.
-# The test suite pauses for this time whenever a connection is about to be
-# opened and the server may be resetting.
-# The server may be resetting when the test case is entered (in startup())
-# as a result of closing the last connection in the previous test case.
-# The server also resets in a few places in the test for XCloseDisplay().
-XT_RESET_DELAY=1
-
-# XT_EXTENSIONS - Specifies whether you wish to test the extended assertions
-# which require the XTEST extension.
-# Set this to Yes if the XTEST extension is available on your system,
-# and you have configured the test suite to use the XTEST extension,
-# and you want to execute these tests, otherwise set to No.
-XT_EXTENSIONS=Yes
-
-###########################################################
-# Configuration parameters for specific tests
-###########################################################
-
-# XT_VISUAL_CLASSES - A space separated list of the visual classes that
-# are supported for the screen given by DISPLAY. Each visual class
-# is followed by a list of depths at which the class is supported
-# (enclosed by brackets and separated by commas with no spaces).
-# Visual classes and depths that are supported only by other screens
-# should not be included.
-# Note - this parameter is used to check the correctness of the information
-# returned by XMatchVisualInfo and XGetVisualInfo. Other tests which loop
-# over visuals obtain the visuals by calling these functions.
-# Example values are:
-XT_VISUAL_CLASSES=DirectColor(24) TrueColor(24) TrueColor(32)
-
-# XT_FONTCURSOR_GOOD - This specifies the number of a glyph in the
-# default cursor font known to exist.
-# XT_FONTCURSOR_GOOD+2 should also be a glyph in the default cursor font.
-# Neither of these should be the same as the X server's default cursor.
-XT_FONTCURSOR_GOOD=2
-
-# XT_FONTCURSOR_BAD - This specifies the number of a glyph in the
-# default cursor font known not to exist. If there is no such
-# number then set this parameter to UNSUPPORTED.
-XT_FONTCURSOR_BAD=9999
-
-# XT_FONTPATH_GOOD -
-# This should be set to a comma separated list that is a valid font path
-# for the X server. It should be different to the list specified by
-# XT_FONTPATH. It need not contain the test fonts.
-XT_FONTPATH_GOOD=catalogue:/etc/X11/fontpath.d,built-ins
-
-# XT_FONTPATH_BAD - This should be set to a comma separated list that
-# is an invalid font path for the X server.
-XT_FONTPATH_BAD=/no-such-path-name
-
-# XT_BAD_FONT_NAME - This should be set to a non-existent font name.
-XT_BAD_FONT_NAME=non-existent-font-name
-
-# XT_GOOD_COLORNAME - This should be set to the name of a colour
-# which exists in the colour database for the X server.
-XT_GOOD_COLORNAME=red
-
-# XT_BAD_COLORNAME - This should be set to the name of a colour
-# which does not exist in the colour database for the X server.
-XT_BAD_COLORNAME=nosuchcolor
-
-# XT_DISPLAYMOTIONBUFFERSIZE - specifies size of pointer motion buffer
-# This should be set to a non-zero value (the value returned by
-# XDisplayMotionBufferSize) if the X server supports a more complete
-# history of pointer motion than that provided by event notification, or
-# zero otherwise.
-XT_DISPLAYMOTIONBUFFERSIZE=256
-
-###########################################################
-# Configuration parameters for Display functions
-###########################################################
-
-# XT_SCREEN_COUNT - This parameter should be set to the number of screens
-# available on the display, as returned by XScreenCount.
-XT_SCREEN_COUNT=1
-
-# XT_PIXMAP_DEPTHS - A space separated list of depths supported by
-# the specified screen of the display that can be used for pixmaps.
-XT_PIXMAP_DEPTHS=24 1 4 8 15 16 32
-
-# XT_BLACK_PIXEL - This parameter should be set to the black pixel value
-# of the specified screen of the display.
-XT_BLACK_PIXEL=0
-
-# XT_WHITE_PIXEL - This parameter should be set to the white pixel value
-# of the specified screen of the display.
-XT_WHITE_PIXEL=16777215
-
-# XT_HEIGHT_MM - This parameter should be set to the height in millimeters
-# of the specified screen of the display.
-XT_HEIGHT_MM=476
-
-# XT_WIDTH_MM - This parameter should be set to the width in millimeters
-# of the specified screen of the display.
-XT_WIDTH_MM=846
-
-# XT_PROTOCOL_VERSION - This should be set to the major version number (11)
-# of the X protocol as returned by XProtocolVersion.
-XT_PROTOCOL_VERSION=11
-
-# XT_PROTOCOL_REVISION - This should be set to the minor protocol
-# revision number as returned by XProtocolRevision.
-XT_PROTOCOL_REVISION=0
-
-# XT_SERVER_VENDOR - This should be set to the X server vendor string
-# as returned by XServerVendor.
-XT_SERVER_VENDOR=Fedora Project
-
-# XT_VENDOR_RELEASE - This should be set to the X server vendor's release
-# number as returned by XVendorRelease.
-XT_VENDOR_RELEASE=11999902
-
-# XT_DOES_SAVE_UNDERS - Set this to Yes if the specified screen of the display
-# supports save unders (indicated by XDoesSaveUnders returning True)
-# otherwise set to No.
-XT_DOES_SAVE_UNDERS=No
-
-# XT_DOES_BACKING_STORE - Set this to the following value:
-# - 0 if the way the specified screen supports backing store is NotUseful
-# - 1 if the way the specified screen supports backing store is WhenMapped
-# - 2 if the way the specified screen supports backing store is Always
-# The way the specified screen supports backing store is indicated by the
-# return value of XDoesBackingStore.
-XT_DOES_BACKING_STORE=0
-
-###########################################################
-# Configuration parameters for connection tests
-###########################################################
-
-# XT_POSIX_SYSTEM - This may be set to Yes to indicate that the
-# underlying operating system is a POSIX system. If this parameter is
-# set to Yes, some extended assertions which describe implementation
-# dependent functionality will be tested assuming POSIX concepts.
-XT_POSIX_SYSTEM=Yes
-
-# XT_TCP - Set this to yes if clients can connect to the X server under
-# test using TCP streams. This will be used (on a POSIX system)
-# in the tests for XOpenDisplay.
-XT_TCP=No
-
-# XT_DISPLAYHOST - Set this to the hostname of the machine on which
-# the display is physically attached. This will be used instead of
-# DISPLAY (on a POSIX system) in the tests for XOpenDisplay which
-# specifically test the hostname component of the display name.
-# Note that this may not be the same as the machine on which the
-# test suite clients execute (XTESTHOST).
-XT_DISPLAYHOST=
-
-# XT_LOCAL - Set this to yes if clients can connect to a local X server
-# without passing a hostname to XOpenDisplay. This will be used
-# (on a POSIX system) in the tests for XOpenDisplay.
-# This is usually the case when the X server under test is running on the
-# same platform as the X test suite.
-# When a hostname is omitted, the Xlib implementation of XOpenDisplay
-# can use the fastest available transport mechanism to make local connections.
-XT_LOCAL=Yes
-
-
-###########################################################################
-# The following variables are options which do not affect test results.
-# They only alter the accompanying output from the test suite.
-# They are accessed with the tet_getvar() function.
-###########################################################################
-
-# XT_SAVE_SERVER_IMAGE - When set to Yes, the image produced by the server
-# that is compared with the known good image is dumped to a file
-# with suffix .sav.
-XT_SAVE_SERVER_IMAGE=No
-
-# XT_OPTION_NO_CHECK - This may be set to Yes to suppress the journal file
-# records containing CHECK keywords.
-XT_OPTION_NO_CHECK=Yes
-
-# XT_OPTION_NO_TRACE - This may be set to Yes to suppress the journal file
-# records containing TRACE keywords.
-XT_OPTION_NO_TRACE=Yes
-
-###########################################################################
-# The following variables are intended for use in debugging. They should
-# not be used when running verification tests.
-# They are accessed with the tet_getvar() function.
-###########################################################################
-
-# XT_DEBUG - This may be set to a debugging level between 0 and 9.
-# A higher level produces more debugging output. Output is only
-# produced by the test suite at levels 1, 2 and 3 at present. So setting
-# this variable to 0 produces no debug output.
-XT_DEBUG=0
-
-# XT_DEBUG_OVERRIDE_REDIRECT - When set to Yes, windows are created with
-# override_redirect set. Otherwise windows are not created with
-# override_redirect set. This enables tests to be run more easily with a
-# window manager running on the same screen.
-# This should not be set to Yes for verification tests.
-XT_DEBUG_OVERRIDE_REDIRECT=No
-
-# XT_DEBUG_PAUSE_AFTER - When set to Yes, the test pauses before calls to
-# the function being tested, until Carriage Return is entered.
-# This should not be set to Yes for verification tests.
-XT_DEBUG_PAUSE_AFTER=No
-
-# XT_DEBUG_PIXMAP_ONLY - When set to Yes, tests which would normally loop over
-# both windows and pixmaps are restricted to loop over just pixmaps.
-# This should not be set to Yes for verification tests.
-# If XT_DEBUG_WINDOW_ONLY is also set, some tests will report UNRESOLVED due
-# to the fact that nothing has been tested.
-XT_DEBUG_PIXMAP_ONLY=No
-
-# XT_DEBUG_WINDOW_ONLY - When set to Yes, tests which would normally loop over
-# both windows and pixmaps are restricted to loop over just windows.
-# This should not be set to Yes for verification tests.
-# If XT_DEBUG_PIXMAP_ONLY is also set, some tests will report UNRESOLVED due
-# to the fact that nothing has been tested.
-XT_DEBUG_WINDOW_ONLY=No
-
-# XT_DEBUG_DEFAULT_DEPTHS - When set to Yes, tests which would normally loop
-# over multiple depths are restricted to test just the first visual
-# returned by XGetVisualInfo and/or the first pixmap depth returned by
-# XListDepths (depending on whether XT_DEBUG_PIXMAP_ONLY or
-# XT_DEBUG_WINDOW_ONLY is also set).
-# This should not be set to Yes for verification tests.
-# Note that the first visual returned by XGetVisualInfo may not be
-# the default visual for the screen.
-XT_DEBUG_DEFAULT_DEPTHS=No
-
-# XT_DEBUG_VISUAL_IDS - When set to a non-empty string, tests which would
-# normally loop over multiple depths are restricted to test just the
-# visuals ID's listed. Note that visual ID's for visuals on more than
-# one screen may be entered, but those used will depend on whether the test
-# being executed uses visuals on the default screen or alternate screen.
-# The visuals ID's should be entered in decimal, octal or hexadecimal
-# and separated with commas and with no intervening spaces.
-# This should not be set to a non-empty string for verification tests.
-XT_DEBUG_VISUAL_IDS=
-
-# XT_DEBUG_NO_PIXCHECK - When set to Yes, tests which would normally
-# perform pixmap verification omit this (all other processing is
-# performed in those tests as normal).
-# Pixmap verification is a scheme which compares the image produced by
-# the X server with a known good image file which is part of the test
-# suite.
-# This should not be set to Yes for verification tests.
-XT_DEBUG_NO_PIXCHECK=No
-
-# XT_DEBUG_BYTE_SEX - When set to NATIVE, REVERSE, MSB or LSB,
-# the X Protocol tests will only be executed with the specified byte sex.
-# When set to BOTH, the X Protocol tests make connections to the X server using
-# both the native and reversed byte sex.
-XT_DEBUG_BYTE_SEX=BOTH
-
-# XT_DEBUG_VISUAL_CHECK - When set to a non-zero value, the X Protocol tests
-# will pause for the specified time interval (in seconds) to enable a visual
-# check to be performed on the displayed screen contents.
-XT_DEBUG_VISUAL_CHECK=0
-
-###########################################################################
-# The following variables are intended for use only in generating known good
-# image files.
-###########################################################################
-
-# XT_FONTDIR - The directory in which the VSW5 fonts are supplied (before
-# being installed).
-# This must be set such that appending a string gives a valid file name.
-# This is normally set to $TET_ROOT/xts5/fonts/
-# This is only used by the PV library which is not part of the test suite.
-XT_FONTDIR=
-
-##############################################
-# The following variables are used in xim tests
-##############################################
-#
-
-#
-# XT_LOCALE - The locales in which input method tests are run
-#
-XT_LOCALE=C
-
-#
-# XT_FONTSET - The base font name list used to select fonts when font
-# sets are generated.
-#
-XT_FONTSET=-vsw-*-*-r-normal--*-120-75-75-*-*-*-*,-vsw-*-*-r-normal--*-180-75-75-*-*-*-*
-
-#
-# XT_LOCALE_MODIFIERS - Used to verify that XSetLocaleModifiers works
-# properly.
-#
-XT_LOCALE_MODIFIERS=@im=none
-
-#
-# XT_SAVE_IM - Used for developing and debugging input method tests.
-#
-XT_SAVE_IM=No
-
-# Undocumented variables:
-
-DISPLAY=:0
commit e8b4e94d5192f72be3f768ac11a5e27890e6bc8d
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Feb 22 11:52:42 2019 +0100
Drop Travis Linux build in favour of GitLab CI
Fold build-travis-deps.sh into .gitlab-ci.yml.
Preparation for the next change, which would break the Travis Linux
build.
Reviewed-by: Eric Anholt <eric at anholt.net>
(Cherry picked from commit ed44f9cd6a4ccf6de7dda70432764b4da10f3f44)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5f4bc461..fc970bd25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,5 +5,23 @@ job:
when: on_failure
paths:
- build/test/piglit-results/
+ variables:
+ PIGLIT_DIR: /root/piglit
+ XTEST_DIR: /root/xts
script:
- - ./test/scripts/build-travis-deps.sh
+ - |
+ cat > $PIGLIT_DIR/piglit.conf << _EOF_
+ [xts]
+ path=$XTEST_DIR
+ _EOF_
+ - cp test/tetexec.cfg $XTEST_DIR/xts5
+ - meson -Dprefix=/usr build/
+ - |
+ ninja -C build/ install
+ set +e
+ set -x
+ ninja -C build/ test
+ status=$?
+ cat build/meson-logs/testlog.txt
+ cat build/test/piglit-results/xvfb/long-summary || :
+ exit $status
diff --git a/.travis.yml b/.travis.yml
index 5fbb29b68..15677891b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,24 +6,13 @@ branches:
matrix:
include:
- - os: linux
- dist: trusty
- services: docker
- env: DISTRO=rawhide:v5
- os: osx
osx_image: xcode9.2
env: DISTRO=xcode9.2
install:
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
-
-before_script:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull nwnk/xserver-travis-$DISTRO ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM nwnk/xserver-travis-$DISTRO > Dockerfile ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
+ - HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
script:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root && ./test/scripts/build-travis-deps.sh" ; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./test/scripts/build-travis-osx.sh ; fi
+ - ./test/scripts/build-travis-osx.sh
- ccache -s
diff --git a/test/scripts/build-travis-deps.sh b/test/scripts/build-travis-deps.sh
deleted file mode 100755
index 6fd20b231..000000000
--- a/test/scripts/build-travis-deps.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-export PREFIX=/usr
-export TRAVIS_BUILD_DIR=/root
-export PIGLIT_DIR=$TRAVIS_BUILD_DIR/piglit
-export XTEST_DIR=$TRAVIS_BUILD_DIR/xts
-
-cat > "$PIGLIT_DIR"/piglit.conf << _EOF_
-[xts]
-path=$XTEST_DIR
-_EOF_
-
-# awful
-cp test/tetexec.cfg $XTEST_DIR/xts5
-
-set -x
-
-meson -Dprefix=$PREFIX build/
-ninja -C build/ install
-ninja -C build/ test
-
-status=$?
-
-cat build/meson-logs/testlog.txt
-cat build/test/piglit-results/xvfb/long-summary || :
-# there should be a better way of extracting results, but:
-# find build/test/piglit-results/xvfb/ | grep setfontpath | xargs cat
-# isn't the worst thing ever
-
-exit $status
commit 4925f38dc0559a8cbe01ec947edeb5eeb78a4df6
Author: Michel Daenzer <michel at daenzer.net>
Date: Fri Feb 22 11:51:57 2019 +0100
Make artifacts of piglit results if job fails
Can be useful for figuring out what caused the failure.
(Cherry picked from commit a7472da94136ef977b8d6af956a15767736236ea)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 092f3427f..a5f4bc461 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,9 @@
image: nwnk/xserver-travis-rawhide:v5
job:
+ artifacts:
+ when: on_failure
+ paths:
+ - build/test/piglit-results/
script:
- ./test/scripts/build-travis-deps.sh
commit b6ef90d83b4fd9230ca334116c61fd52f1d68209
Author: Michel Daenzer <michel at daenzer.net>
Date: Fri Feb 22 11:51:35 2019 +0100
travis: Use a single meson invocation
The prefix setting didn't take for some reason.
(Cherry picked from commit c1bb392b1df4023e9dec489facfa221a53499ddc)
diff --git a/test/scripts/build-travis-deps.sh b/test/scripts/build-travis-deps.sh
index f52587dd5..6fd20b231 100755
--- a/test/scripts/build-travis-deps.sh
+++ b/test/scripts/build-travis-deps.sh
@@ -15,8 +15,7 @@ cp test/tetexec.cfg $XTEST_DIR/xts5
set -x
-meson setup build/
-meson configure -Dprefix=$PREFIX build/
+meson -Dprefix=$PREFIX build/
ninja -C build/ install
ninja -C build/ test
commit 7753fd9989e280783daeee1994d019155735dee5
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Feb 22 11:50:05 2019 +0100
gitlab: Skip the docker-in-docker step
No idea which cult's cargo I was looking at there. Cuts about a minute
off the build time.
Signed-off-by: Adam Jackson <ajax at redhat.com>
(Cherry picked from commit a41ccaa0857146e986f11360d4f2aeb3913af9a6)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d66bb0b62..092f3427f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,5 @@
-image: docker:latest
-services:
- - docker:dind
-
-before_script:
- - echo FROM nwnk/xserver-travis-rawhide:v5 > Dockerfile
- - echo ADD . /root >> Dockerfile
- - echo WORKDIR /root >> Dockerfile
- - docker build -t withgit .
+image: nwnk/xserver-travis-rawhide:v5
job:
script:
- - docker run --volume $HOME/.ccache:/root/.ccache withgit ./test/scripts/build-travis-deps.sh
+ - ./test/scripts/build-travis-deps.sh
More information about the xorg-commit
mailing list