summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEmma Anholt <emma@anholt.net>2023-04-05 12:31:51 -0700
committerMarge Bot <emma+marge@anholt.net>2023-04-24 19:21:50 +0000
commit75a08b04d7d0c2b41f82d7bbab7a5bd932429119 (patch)
tree86632483f99437ba681a4975642800bcc2f3908b /.gitlab-ci
parent5ae6a9bd7081f3222bb42226385d40564193daca (diff)
downloadmesa-75a08b04d7d0c2b41f82d7bbab7a5bd932429119.tar.gz
ci: Move zink's validation layer setup to deqp-runner.sh.
I want the path to be always set in case someone wants some ZINK_DEBUG=validation, rather than having to do it per test job. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22459>
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/deqp-runner.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 29a0b56c2dc..dc29a1ea19e 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -124,6 +124,9 @@ if [ "$PIGLIT_PLATFORM" = "gbm" ]; then
DEQP_SKIPS="$DEQP_SKIPS $INSTALL/gbm-skips.txt"
fi
+# Set the path to VK validation layer settings (in case it ends up getting loaded)
+export VK_LAYER_SETTINGS_PATH=$INSTALL/$GPU_VERSION-validation-settings.txt
+
report_load() {
echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)"