Mesa (main): ci: update vkd3d-proton builder/runner

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 70ba820395e155d19df4aca44756ee3ce86e94a2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=70ba820395e155d19df4aca44756ee3ce86e94a2

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Jun  9 13:37:33 2022 +0200

ci: update vkd3d-proton builder/runner

Do not need to cross compile just for running the testsuite. Only
RADV will make use of it anyways.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Martin Roukala <martin.roukala at mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17050>

---

 .gitlab-ci/container/build-vkd3d-proton.sh | 11 ++++-------
 .gitlab-ci/container/debian/x86_test-vk.sh |  1 +
 .gitlab-ci/image-tags.yml                  |  2 +-
 .gitlab-ci/vkd3d-proton/run.sh             |  6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh
index 0da94de9d73..7a689e00655 100644
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -16,7 +16,7 @@ function build_arch {
   meson "$@"                               \
         -Denable_tests=true                \
         --buildtype release                \
-        --prefix "$VKD3D_PROTON_BUILD_DIR" \
+        --prefix "$VKD3D_PROTON_DST_DIR"   \
         --strip                            \
         --bindir "x${arch}"                \
         --libdir "x${arch}"                \
@@ -24,7 +24,7 @@ function build_arch {
 
   ninja -C "$VKD3D_PROTON_BUILD_DIR/build.${arch}" install
 
-  install -D -m755 -t "${VKD3D_PROTON_DST_DIR}/x${arch}/bin" "$VKD3D_PROTON_BUILD_DIR/build.${arch}/tests/"*.exe
+  install -D -m755 -t "${VKD3D_PROTON_DST_DIR}/x${arch}/bin" "$VKD3D_PROTON_BUILD_DIR/build.${arch}/tests/d3d12"
 }
 
 git clone https://github.com/HansKristian-Work/vkd3d-proton.git --single-branch -b "v$VKD3D_PROTON_VERSION" --no-checkout "$VKD3D_PROTON_SRC_DIR"
@@ -32,12 +32,9 @@ pushd "$VKD3D_PROTON_SRC_DIR"
 git checkout "$VKD3D_PROTON_COMMIT"
 git submodule update --init --recursive
 git submodule update --recursive
-build_arch 64 --cross-file build-win64.txt
-build_arch 86 --cross-file build-win32.txt
-cp "setup_vkd3d_proton.sh" "$VKD3D_PROTON_BUILD_DIR/setup_vkd3d_proton.sh"
-chmod +x "$VKD3D_PROTON_BUILD_DIR/setup_vkd3d_proton.sh"
+build_arch 64
+build_arch 86
 popd
 
-"$VKD3D_PROTON_BUILD_DIR"/setup_vkd3d_proton.sh install
 rm -rf "$VKD3D_PROTON_BUILD_DIR"
 rm -rf "$VKD3D_PROTON_SRC_DIR"
diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh
index 67389861d65..e2fb2021592 100644
--- a/.gitlab-ci/container/debian/x86_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_test-vk.sh
@@ -37,6 +37,7 @@ STABLE_EPHEMERAL=" \
       pkg-config \
       python3-distutils \
       wget \
+      wine64-tools \
       xz-utils \
       "
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 94a20f9511f..e24ab072930 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -9,7 +9,7 @@ variables:
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
    DEBIAN_X86_TEST_GL_TAG: "2022-06-09-piglit-update"
-   DEBIAN_X86_TEST_VK_TAG: "2022-06-14-hang-detection"
+   DEBIAN_X86_TEST_VK_TAG: "2022-06-14-vkd3d-proton"
 
    FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
    KERNEL_ROOTFS_TAG: "2022-06-09-piglit-update"
diff --git a/.gitlab-ci/vkd3d-proton/run.sh b/.gitlab-ci/vkd3d-proton/run.sh
index 755bb901b69..c10cc352462 100755
--- a/.gitlab-ci/vkd3d-proton/run.sh
+++ b/.gitlab-ci/vkd3d-proton/run.sh
@@ -14,7 +14,7 @@ RESULTS=$(realpath -s "$PWD"/results)
 # Modifiying here directly LD_LIBRARY_PATH may cause problems when
 # using a command wrapper. Hence, we will just set it when running the
 # command.
-export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
+export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/x64/"
 
 
 # Sanity check to ensure that our environment is sufficient to make our tests
@@ -64,7 +64,7 @@ else
     mkdir "$RESULTS"
 fi
 
-VKD3D_PROTON_TESTSUITE_CMD="wine /vkd3d-proton-tests/x64/bin/d3d12.exe >$RESULTS/vkd3d-proton.log 2>&1"
+VKD3D_PROTON_TESTSUITE_CMD="/vkd3d-proton-tests/x64/bin/d3d12 >$RESULTS/vkd3d-proton.log"
 
 quiet printf "%s\n" "Running vkd3d-proton testsuite..."
 RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $HANG_DETECTION_CMD $VKD3D_PROTON_TESTSUITE_CMD"
@@ -72,7 +72,7 @@ RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $HANG_DETECTION_CMD $VKD3D_P
 set +e
 eval $RUN_CMD
 
-VKD3D_PROTON_RESULTS="vkd3d-proton-${VKD3D_PROTON_RESULTS:-results}"
+VKD3D_PROTON_RESULTS="${VKD3D_PROTON_RESULTS:-vkd3d-proton-results}"
 RESULTSFILE="$RESULTS/$VKD3D_PROTON_RESULTS.txt"
 mkdir -p .gitlab-ci/vkd3d-proton
 grep "Test failed" "$RESULTS"/vkd3d-proton.log > "$RESULTSFILE"