X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci%2Fcontainer%2Fx86_test-gl.sh;h=41816bb99b6c2cfd8a4c5b7be3d4bcb6edf465fc;hb=2a4c361b069bb84facc7e6b8ae19908505c12850;hp=6a0a78183e01fc729259df022ca1295d699ef62a;hpb=803ab5d6be6bc63e3eae827d7297e0cd98cc61dd;p=mesa.git

diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 6a0a78183e0..41816bb99b6 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -6,23 +6,23 @@ set -o xtrace
 export DEBIAN_FRONTEND=noninteractive
 
 apt-get install -y \
-        ca-certificates \
-        gnupg \
+      ca-certificates \
+      gnupg
 
 # Upstream LLVM package repository
 apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
 echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
 
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
-echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
+echo 'deb https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/testing.list
 
 apt-get update
 
-# Use newer packages from backports by default
+# Don't use newer packages from testing by default
 cat >/etc/apt/preferences <<EOF
 Package: *
-Pin: release a=buster-backports
-Pin-Priority: 500
+Pin: release a=testing
+Pin-Priority: 100
 EOF
 
 apt-get dist-upgrade -y
@@ -30,52 +30,65 @@ apt-get dist-upgrade -y
 apt-get install -y --no-remove \
       autoconf \
       automake \
+      ccache \
       cmake \
       g++ \
-      git \
-      git-lfs \
       gcc \
+      git \
       libexpat1 \
       libgbm-dev \
       libgles2-mesa-dev \
-      libpcre32-3 \
+      libllvm9 \
       libpcre3-dev \
-      libpng16-16 \
+      libpcre32-3 \
       libpng-dev \
+      libpng16-16 \
       libpython3.7 \
-      libvulkan1 \
       libvulkan-dev \
+      libvulkan1 \
       libwaffle-dev \
       libwayland-server0 \
       libxcb-keysyms1 \
       libxcb-keysyms1-dev \
       libxcb-xfixes0 \
-      libxkbcommon0 \
       libxkbcommon-dev \
-      libxrender1 \
+      libxkbcommon0 \
       libxrender-dev \
-      libllvm9 \
+      libxrender1 \
       make \
       meson \
       patch \
       pkg-config \
       python \
-      python3.7 \
-      python3.7-dev \
       python3-distutils \
       python3-mako \
       python3-numpy \
       python3-pil \
-      python3-pilkit \
+      python3-pytest \
+      python3-requests \
       python3-six \
       python3-yaml \
+      python3.7 \
+      python3.7-dev \
       qt5-default \
       qt5-qmake \
       waffle-utils \
+      wget \
       xauth \
       xvfb \
+      xz-utils \
       zlib1g
 
+# Install packages we need from Debian testing last, to avoid pulling in more
+apt-get install -y -t testing \
+      libc6-dev
+
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Build virglrenderer
+
+. .gitlab-ci/build-virglrenderer.sh
 
 ############### Build piglit
 
@@ -99,9 +112,12 @@ apt-get install -y --no-remove \
 
 ############### Uninstall the build software
 
+ccache --show-stats
+
 apt-get purge -y \
       autoconf \
       automake \
+      ccache \
       cmake \
       g++ \
       gcc \
@@ -119,7 +135,9 @@ apt-get purge -y \
       meson \
       patch \
       pkg-config \
+      python3-distutils \
       python3.7-dev \
-      python3-distutils
+      wget \
+      xz-utils
 
 apt-get autoremove -y --purge