projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d488d0f)
ci: enable ACO tests
authorRhys Perry <pendingchaos02@gmail.com>
Wed, 3 Jun 2020 13:25:12 +0000 (14:25 +0100)
committerMarge Bot <eric+marge@anholt.net>
Thu, 30 Jul 2020 16:13:08 +0000 (16:13 +0000)
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Acked-by: Daniel Schürmann <daniel@schuermann.dev>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3521>

.gitlab-ci.yml patch | blob | history
.gitlab-ci/container/x86_build-base.sh patch | blob | history

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e63539fc1f666b94693915bdde22f22785b47a32..7f4e269742a61031d9fe4a066f722d527b57074b 100644 (file)
--- 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 e6a1db2028f1709b678d7f700ff662e0c0d4d124..830699ae4eade97806381186badb5cebb4c4570b 100644 (file)
--- 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/