From 61a41591d4900f628abd079ef15344c265b9d3b9 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 19 Mar 2026 12:42:47 -0700 Subject: [PATCH] ci: Don't set wine vars in deqp-runner.sh/vkd3d-runner.sh. While we run vkd3d-proton tests, that doesn't actually execute wine or rely on wine env vars at all. Part-of: --- .gitlab-ci/deqp-runner.sh | 5 ----- .gitlab-ci/vkd3d-runner.sh | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index d8f13f769ac..cb641eb5ad5 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -52,11 +52,6 @@ fi if [ -n "$VKD3D_PROTON_TAG" ]; then # Are we using the right vkd3d-proton version? ci_tag_test_time_check "VKD3D_PROTON_TAG" - - # Set environment for Wine. - export WINEDEBUG="-all" - export WINEPREFIX="/vkd3d-proton-wine64" - export WINEESYNC=1 fi diff --git a/.gitlab-ci/vkd3d-runner.sh b/.gitlab-ci/vkd3d-runner.sh index f30c587156d..acf4708d3d7 100755 --- a/.gitlab-ci/vkd3d-runner.sh +++ b/.gitlab-ci/vkd3d-runner.sh @@ -36,11 +36,6 @@ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$INSTALL/lib/" ARCH=$(uname -m) export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json" -# Set environment for Wine. -export WINEDEBUG="-all" -export WINEPREFIX="/vkd3d-proton-wine64" -export WINEESYNC=1 - if [ -f "$INSTALL/$GPU_VERSION-vkd3d-skips.txt" ]; then mapfile -t skips < <(grep -vE '^#|^$' "$INSTALL/$GPU_VERSION-vkd3d-skips.txt") VKD3D_TEST_EXCLUDE=$(comma_separated "${skips[@]}")