From: Andres Gomez <agomez@igalia.com>
Date: Thu, 20 Feb 2020 12:18:54 +0000 (+0200)
Subject: gitlab-ci: build gfxreconstruct into the Vulkan testing container
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=028ab482bfbd9aa703c9d6fa658020951e071b67;p=mesa.git

gitlab-ci: build gfxreconstruct into the Vulkan testing container

In preparation for having automated testing with Vulkan traces.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 700e8a1d5a0..41dbf0bdc92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,7 +131,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-vk "2020-02-01"
+    DEBIAN_TAG: &x86_test-vk "2020-02-02"
   # Can only be triggered manually on personal branches because RADV is the only
   # driver that does Vulkan testing at the moment.
   rules:
diff --git a/.gitlab-ci/build-gfxreconstruct.sh b/.gitlab-ci/build-gfxreconstruct.sh
new file mode 100644
index 00000000000..cb1548ca235
--- /dev/null
+++ b/.gitlab-ci/build-gfxreconstruct.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -ex
+
+# https://github.com/LunarG/gfxreconstruct/issues/328
+GFXRECONSTRUCT_VERSION=b66cd392a84b226cb60ad9d4130ddeb58a1559cb
+
+git clone https://github.com/LunarG/gfxreconstruct.git --single-branch --no-checkout /gfxreconstruct
+pushd /gfxreconstruct
+git checkout "$GFXRECONSTRUCT_VERSION"
+git submodule update --init
+git submodule update
+cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release
+ninja -C _build -j4 gfxrecon-replay
+mkdir -p build/bin
+install _build/tools/replay/gfxrecon-replay build/bin
+strip build/bin/*
+find . -not -path './build' -not -path './build/*' -delete
+popd
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index e1f95f300d1..13660481214 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -35,10 +35,13 @@ apt-get install -y --no-remove \
       libexpat1 \
       libgbm-dev \
       libgles2-mesa-dev \
+      liblz4-1 \
+      liblz4-dev \
       libpng16-16 \
       libpng-dev \
       libvulkan1 \
       libvulkan-dev \
+      libwayland-client0 \
       libwayland-server0 \
       libxcb-randr0 \
       libxcb-xfixes0 \
@@ -64,6 +67,9 @@ apt-get install -y --no-remove \
 
 . .gitlab-ci/build-deqp-vk.sh
 
+############### Build gfxreconstruct
+
+. .gitlab-ci/build-gfxreconstruct.sh
 
 ############### Uninstall the build software
 
@@ -75,6 +81,7 @@ apt-get purge -y \
       gnupg \
       libgbm-dev \
       libgles2-mesa-dev \
+      liblz4-dev \
       libpng-dev \
       libvulkan-dev \
       libxkbcommon-dev \