From 35a7ec79dbbbea313f587b49a8b67b097f244715 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 18 Nov 2019 09:26:00 +0100
Subject: [PATCH] gitlab-ci: build dEQP VK 1.1.6 in the x86 test image for VK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
---
 .gitlab-ci/build-deqp-vk.sh         | 33 +++++++++++++++++++++++++++++
 .gitlab-ci/container/x86_test-vk.sh |  7 +++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 .gitlab-ci/build-deqp-vk.sh

diff --git a/.gitlab-ci/build-deqp-vk.sh b/.gitlab-ci/build-deqp-vk.sh
new file mode 100644
index 00000000000..0ecca19b951
--- /dev/null
+++ b/.gitlab-ci/build-deqp-vk.sh
@@ -0,0 +1,33 @@
+git clone --depth 1 \
+    https://github.com/KhronosGroup/VK-GL-CTS.git \
+    -b vulkan-cts-1.1.6.0 \
+    /VK-GL-CTS
+cd /VK-GL-CTS
+
+# --insecure is due to SSL cert failures hitting sourceforge for zlib and
+# libpng (sigh).  The archives get their checksums checked anyway, and git
+# always goes through ssh or https.
+python3 external/fetch_sources.py --insecure
+
+mkdir -p /deqp
+cd /deqp
+cmake -G Ninja \
+      -DDEQP_TARGET=x11_glx \
+      -DCMAKE_BUILD_TYPE=Release \
+      /VK-GL-CTS
+ninja -j4
+
+# Copy out the mustpass list we want.
+mkdir /deqp/mustpass
+cp /VK-GL-CTS/external/vulkancts/mustpass/master/vk-default.txt \
+   /deqp/mustpass/vk-master.txt
+
+rm -rf /deqp/modules/internal
+rm -rf /deqp/executor
+rm -rf /deqp/execserver
+rm -rf /deqp/modules/egl
+rm -rf /deqp/framework
+find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf
+strip external/vulkancts/modules/vulkan/deqp-vk
+du -sh *
+rm -rf /VK-GL-CTS
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 8f97c3741c6..206c63e0766 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -34,6 +34,7 @@ apt-get install -y --no-remove \
       libvulkan1 \
       libvulkan-dev \
       libwayland-server0 \
+      libxcb-randr0 \
       libxcb-xfixes0 \
       libxkbcommon0 \
       libxkbcommon-dev \
@@ -42,6 +43,7 @@ apt-get install -y --no-remove \
       meson \
       patch \
       pkg-config \
+      python3-distutils \
       python \
       xauth \
       xvfb
@@ -51,7 +53,10 @@ apt-get install -y --no-remove \
 
 . .gitlab-ci/build-cts-runner.sh
 
-# TODO: build dEQP VK.
+############### Build dEQP VK
+
+. .gitlab-ci/build-deqp-vk.sh
+
 
 ############### Uninstall the build software