Mesa (master): ci: enable ACO tests

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 54394a4d3b1896ba85978cfdbc43ebb7a72fe399
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=54394a4d3b1896ba85978cfdbc43ebb7a72fe399

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Wed Jun  3 14:25:12 2020 +0100

ci: enable ACO tests

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Acked-by: Daniel Schürmann <daniel at schuermann.dev>
Acked-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3521>

---

 .gitlab-ci.yml                         | 1 +
 .gitlab-ci/container/x86_build-base.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e63539fc1f6..7f4e269742a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -739,6 +739,7 @@ meson-vulkan:
     VULKAN_DRIVERS: intel,amd,freedreno
     EXTRA_OPTION: >
       -D vulkan-overlay-layer=true
+      -D build-aco-tests=true
       -D werror=true
 
 meson-i386:
diff --git a/.gitlab-ci/container/x86_build-base.sh b/.gitlab-ci/container/x86_build-base.sh
index e6a1db2028f..830699ae4ea 100644
--- a/.gitlab-ci/container/x86_build-base.sh
+++ b/.gitlab-ci/container/x86_build-base.sh
@@ -81,7 +81,7 @@ apt-get install -y --no-remove -t buster-backports \
 # Needed for ci-fairy, this revision is able to upload files to MinIO
 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366
 
-# for the vulkan overlay layer
+# for the vulkan overlay layer and ACO tests
 wget https://github.com/KhronosGroup/glslang/releases/download/SDK-candidate-26-Jul-2020/glslang-master-linux-Release.zip
 unzip glslang-master-linux-Release.zip bin/glslangValidator
 install -m755 bin/glslangValidator /usr/local/bin/