From d6d1485e407a56158f4f14b1ade3a4b412cc3f80 Mon Sep 17 00:00:00 2001
From: Giovanni Mascellani <gmascellani@codeweavers.com>
Date: Thu, 30 Oct 2025 20:47:46 +0100
Subject: [PATCH] ci: Execute DXC tests on 32-bit as well.

---
 gitlab/test.yml |  3 +--
 tests/driver.c  | 12 ++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/gitlab/test.yml b/gitlab/test.yml
index b04d09726..63466a036 100644
--- a/gitlab/test.yml
+++ b/gitlab/test.yml
@@ -12,7 +12,6 @@
     - 'Expand-Archive -Path "warp.zip" -DestinationPath ".\warp"'
     - 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2502/dxc_2025_02_20.zip" -OutFile ".\dxc.zip"'
     - 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"'
-    - '$Env:PATH += ";" + (Convert-Path ".\dxc\bin\x64")'
     - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)'
     - if (Test-Path "pipeline_failed") { exit 1 }
   artifacts:
@@ -21,6 +20,7 @@
       - artifacts
     exclude:
       - artifacts/**/d3d10warp.dll
+      - artifacts/**/dxcompiler.dll
 
 test-win-64:
   extends: .test-win
@@ -32,5 +32,4 @@ test-win-32:
   extends: .test-win
   variables:
     TEST_ARCH: "32"
-    VKD3D_TEST_SKIP_DXC: "1"
     VKD3D_TEST_DEBUG: '1'
diff --git a/tests/driver.c b/tests/driver.c
index a8ee1245b..76b106df3 100644
--- a/tests/driver.c
+++ b/tests/driver.c
@@ -154,6 +154,12 @@ static bool run_tests_for_directory(const char *commit_dir)
             fprintf(stderr, "Cannot copy d3d10warp.dll, last error %ld.\n", GetLastError());
             ret = false;
         }
+        sprintf(dest_filename, "artifacts\\%s\\tests\\dxcompiler.dll", commit_dir);
+        if (!CopyFileA(".\\dxc\\bin\\x64\\dxcompiler.dll", dest_filename, FALSE))
+        {
+            fprintf(stderr, "Cannot copy dxcompiler.dll, last error %ld.\n", GetLastError());
+            ret = false;
+        }
     }
     else
     {
@@ -163,6 +169,12 @@ static bool run_tests_for_directory(const char *commit_dir)
             fprintf(stderr, "Cannot copy d3d10warp.dll, last error %ld.\n", GetLastError());
             ret = false;
         }
+        sprintf(dest_filename, "artifacts\\%s\\tests\\dxcompiler.dll", commit_dir);
+        if (!CopyFileA(".\\dxc\\bin\\x86\\dxcompiler.dll", dest_filename, FALSE))
+        {
+            fprintf(stderr, "Cannot copy dxcompiler.dll, last error %ld.\n", GetLastError());
+            ret = false;
+        }
     }
 
     sprintf(list_filename, "artifacts/%s/tests/shader_tests.txt", commit_dir);